@team-supercharge/oasg 14.1.0-feature-python-fastapi-6dc5992a.0 → 14.1.0-feature-python-fastapi-e25c0a08.0

package/README.md

@@ -704,6 +704,26 @@ Publishing the PyPI packages is done with Twine. For authentication againts the
 Building the distribution package requires Flit.
 Publishing the PyPI packages is done with Twine. For authentication againts the PiPI repository you need to set the `TWINE_USERNAME` and `TWINE_PASSWORD` environment variables.
 
+#### `python-fastapi-raw-request`
+
+```json
+{
+  "id": "server-python",
+  "type": "python-fastapi-raw-request",
+  "source": "source-merged",
+  "packageName": "oasg_example",
+  "repositoryUrl": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/pypi"
+}
+```
+
+|Parameter| Description| Required | Default |
+|-|-|-|-|
+| packageName | Package nem for the project (convention: snake_case) | Y | - |
+| repositoryUrl | URL of the PyPI repository | Y | - |
+
+Building the distribution package requires Flit.
+Publishing the PyPI packages is done with Twine. For authentication againts the PiPI repository you need to set the `TWINE_USERNAME` and `TWINE_PASSWORD` environment variables.
+
 #### `contract-testing`
 
 ```json

package/bin/oasg

@@ -34,25 +34,26 @@ const PROXY_PORT = '9999';
 
 const DEFAULT_GENERATOR_MAPPING = {
   // client targets
-  "android":          { version: '7.0.1',   generator: 'kotlin' },
-  "angular":          { version: '7.0.1',   generator: 'typescript-angular' },
-  "feign":            { version: '7.0.1',   generator: 'spring' },
-  "feign-kotlin":     { version: '7.0.1',   generator: 'kotlin-spring' },
-  "flutter":          { version: '7.0.1',   generator: 'dart-dio' },
-  "ios":              { version: '7.0.1',   generator: 'swift5' },
-  "kmp":              { version: '7.8.0',   generator: 'kotlin' },
-  "python":           { version: '7.0.1',   generator: 'python' },
-  "react":            { version: '7.0.1',   generator: 'typescript-fetch' },
+  "android":                      { version: '7.0.1',   generator: 'kotlin' },
+  "angular":                      { version: '7.0.1',   generator: 'typescript-angular' },
+  "feign":                        { version: '7.0.1',   generator: 'spring' },
+  "feign-kotlin":                 { version: '7.0.1',   generator: 'kotlin-spring' },
+  "flutter":                      { version: '7.0.1',   generator: 'dart-dio' },
+  "ios":                          { version: '7.0.1',   generator: 'swift5' },
+  "kmp":                          { version: '7.8.0',   generator: 'kotlin' },
+  "python":                       { version: '7.0.1',   generator: 'python' },
+  "react":                        { version: '7.0.1',   generator: 'typescript-fetch' },
   // server targets
-  "nestjs":           { version: '7.0.1',   generator: 'typescript-angular' },
-  "spring":           { version: '7.0.1',   generator: 'spring' },
-  "spring-kotlin":    { version: '7.0.1',   generator: 'kotlin-spring' },
-  "python-fastapi":   { version: '7.0.1',   generator: 'python-fastapi' },
-  "dotnet":           { version: '7.8.0',   generator: 'csharp-functions' },
+  "nestjs":                       { version: '7.0.1',   generator: 'typescript-angular' },
+  "spring":                       { version: '7.0.1',   generator: 'spring' },
+  "spring-kotlin":                { version: '7.0.1',   generator: 'kotlin-spring' },
+  "python-fastapi":               { version: '7.8.0',   generator: 'python-fastapi' },
+  "python-fastapi-raw-request":   { version: '7.0.1',   generator: 'python-fastapi' },
+  "dotnet":                       { version: '7.8.0',   generator: 'csharp-functions' },
   // misc targets
-  "contract-testing": { version: '4.3.1',   generator: 'typescript-node' },
-  "openapi":          { version: undefined, generator: undefined },
-  "stubby":           { version: '4.3.1',   generator: 'stubby' },
+  "contract-testing":             { version: '4.3.1',   generator: 'typescript-node' },
+  "openapi":                      { version: undefined, generator: undefined },
+  "stubby":                       { version: '4.3.1',   generator: 'stubby' },
 };
 const DEFAULT_KTLINT_VERSION = '1.0.0';
 const BIN_FOLDER = 'out/.bin';

package/config.schema.yml

@@ -21,6 +21,7 @@ properties:
         - $ref: '#/targets/ios'
         - $ref: '#/targets/Python'
         - $ref: '#/targets/PythonFastApi'
+        - $ref: '#/targets/PythonFastApiRawRequest'
         - $ref: '#/targets/ContractTesting'
         - $ref: '#/targets/NestJS'
         - $ref: '#/targets/OpenAPI'
@@ -312,6 +313,20 @@ targets:
         - packageName
         - repositoryUrl
 
+  PythonFastApiRawRequest:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: "^python-fastapi-raw-request$"
+          packageName:
+            type: string
+          repositoryUrl:
+            type: string
+        required:
+        - packageName
+        - repositoryUrl
+
   ContractTesting:
     allOf:
       - $ref: '#/targets/Base'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "14.1.0-feature-python-fastapi-6dc5992a.0",
+  "version": "14.1.0-feature-python-fastapi-e25c0a08.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/android/templates/build.gradle.mustache

@@ -240,7 +240,7 @@ task sourceJar(type: Jar) {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = '{{packageName}}'
+            groupId = '{{groupId}}'
             artifactId = '{{artifactId}}'
             version = "{{artifactVersion}}"
             artifact(dokkaJar)

package/targets/python-fastapi-raw-request/generate.sh

@@ -0,0 +1,32 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+# if the version contains a `-` character, then use PEP 440 beta version syntax
+# example: 1.0.0-beta.1 -> 1.0.0b0+beta.1
+if [[ $version == *"-"* ]]; then
+  version=$(echo $version | sed 's/-/b0+/')
+  echo "[NOTE] version updated to: ${version}"
+fi
+
+rm -rf out/$targetId
+mkdir -p out/$targetId
+
+java -jar $binary generate \
+  -g $generatorId \
+  -i $openApiFile \
+  -t $templateDir \
+  -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
+  -p "packageVersion=$version,packageName=$packageName" $generatorCustomArgs
+
+cd out/$targetId
+
+touch "src/$packageName/__init__.py"
+python3 -m venv venv
+source venv/bin/activate
+pip install --upgrade pip
+pip install flit==3.9.0
+flit build --no-use-vcs
+
+cd ../../

package/targets/python-fastapi-raw-request/generator-config.json

@@ -0,0 +1,7 @@
+{
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/python-fastapi-raw-request/publish.sh

@@ -0,0 +1,9 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+cd out/$targetId
+source venv/bin/activate
+pip install importlib_metadata==7.2.1 twine==4.0.2
+python3 -m twine upload --repository-url $repositoryUrl dist/*
+cd ../..