Fix build of Python

Author: ad-m

src/generators/python/_README.md

@@ -25,8 +25,8 @@ library installation description
 Then import it and use it as a token provider in your code:
 
 ```python
-from <credentials library name> import get_passport_credentials_helper
-from <client library name> import ApiClient, Configuration
+from credentials import get_passport_credentials_helper
+from h1 import ApiClient, Configuration
 
 provider = get_passport_credentials_helper() # you can optionally pass passport file location
 cfg = Configuration()
@@ -42,8 +42,9 @@ Configuration object allows you to use choosen API client.
 Example:
 
 ```python
-from <credentials library name> import get_passport_credentials_helper
-from <client library name> import Configuration, ApiClient, IamProjectApi
+from credentials import get_passport_credentials_helper
+from h1 import Configuration, ApiClient
+from h1.api.iam_project_api import IamProjectApi
 
 provider = get_passport_credentials_helper()
 cfg = Configuration()
@@ -73,7 +74,8 @@ api_client = ApiClient(cfg, header_name="prefer", header_value="respond-async,wa
 Full example:
 
 ```python
-from <client library name> import Configuration, ApiClient, IamProjectApi
+from h1 import Configuration, ApiClient
+from h1.api.iam_project_api import IamProjectApi
 
 cfg = Configuration()
 api_client = ApiClient(cfg, header_name="prefer", header_value="respond-async,wait=86400")

src/generators/python/config.yaml

@@ -1,2 +1,2 @@
-packageName: h1-client
-projectName: h1
+packageName: h1
+projectName: h1-client

src/generators/python/index.ts

@@ -1,15 +1,50 @@
 import { join } from "path";
+import { readFile, writeFile } from "fs/promises";
+
 import { execute } from "../../utils/shellUtils";
 import { copyLicense } from "../../utils/licenseUtils";
 import { fixPathsInReplacedReadme } from "../../utils/fileUtils";
 
+const dropObjectPattern = (s: any) => {
+  if (!s.properties) return;
+  for (const property of Object.values(s.properties)) {
+    const p: any = property;
+    delete p.pattern;
+    if (p.items) {
+      dropObjectPattern(p.items)
+    }
+  }
+}
+
 export const generatePythonClient = async (
   openapiFile: string,
   outputDir: string
 ): Promise<void> => {
   const config = join(__dirname, "config.yaml");
   const generator = "python";
-
+  const specification = JSON.parse(await readFile(openapiFile, {
+    encoding: 'utf-8'
+  }));
+  // python does not pass validation our regexp
+  // example value: '.components.schemas.iam_project_policy_create.properties.resource'
+  for (const schema of Object.values(specification.components.schemas)) {
+    const s: any = schema;
+    dropObjectPattern(s);
+  }
+  // example value: .paths["/iam/project/{projectId}/policy"].get.parameters
+  for (const endpoint of Object.values(specification.paths)) {
+    const e: any = endpoint;
+    for (const operation of Object.values(e)) {
+      const o: any = operation;
+      if (!o.parameters) continue;
+      for (const parameter of o.parameters) {
+        const p: any = parameter;
+        if (!p.schema) continue;
+        delete p.schema.pattern;
+      }
+    }
+  }
+  await writeFile(openapiFile, JSON.stringify(specification, null, 4));
   await execute(
     `yarn openapi-generator-cli generate --git-user-id "hyperonecom" --git-repo-id "h1-client-python" -i ${openapiFile} -c ${config} -g ${generator} -o ${outputDir}`
   );
@@ -32,7 +67,7 @@ export const generatePythonClient = async (
   const replacementReadmeLocation = join(__dirname, "_README.md");
   await execute(`cp ${replacementReadmeLocation} README.md`, outputDir);
 
-  await execute("pip install .", outputDir);
+  await execute("python3.7 -m pip install .", outputDir);
 
   await copyLicense("MIT", outputDir);
 };

tests/python/execute.sh

@@ -1,4 +1,6 @@
-pip install -r ../../clients/python/requirements.txt
-pip install git+git://github.com/kuskoman/h1-credentials-helper-python.git
+#!/bin/sh
+set -eux
+python -m pip install -r ../../clients/python/requirements.txt
+python -m pip install git+git://github.com/hyperonecom/h1-credentials-helper-python.git
 
 python test.py

tests/python/test.py

@@ -1,6 +1,6 @@
 from credentials import get_passport_credentials_helper
-from h1 import Configuration, ApiClient, IamProjectApi
-
+from h1 import Configuration, ApiClient
+from h1.api.iam_project_api import IamProjectApi
 
 def test_access_token_configuration():
     provider = get_passport_credentials_helper()