Fix clobbered connector-builder-server directories (#19273)

airbyte-connector-builder-server/.gitignore

@@ -1,3 +1,3 @@
 .coverage
 .venv
-state_*.yaml
+state_*.yaml

airbyte-connector-builder-server/README.md

@@ -1 +1,29 @@
-# Connector builder
+# Connector builder
+
+
+## Getting started 
+
+Set up the virtual environment and install dependencies
+```bash
+python -m venv .venv
+source .venv/bin/activate
+pip install .
+```
+
+Then run the server
+```bash
+uvicorn connector_builder.entrypoint:app --host 0.0.0.0 --port 8080
+```
+
+The server is now reachable on localhost:8080
+
+### OpenAPI generation
+
+```bash
+openapi-generator generate -i ../connector-builder-server/src/main/openapi/openapi.yaml -g python-fastapi -c openapi/generator_config.yaml  -o build/server -t openapi/templates 
+```
+
+Or you can run it via Gradle by running this from the Airbyte project root: 
+```bash
+./gradlew :airbyte-connector-builder-server:generateOpenApiPythonServer
+```

airbyte-connector-builder-server/build.gradle

@@ -10,16 +10,36 @@ airbytePython {
     moduleDirectory 'connector_builder'
 }
 
+task generateOpenApiPythonServer(type: GenerateTask){
+    outputs.upToDateWhen { false }
 
-task generateApiServer(type: GenerateTask) {
+    def generatedCodeDir = "$buildDir/server"
     inputSpec = "$rootDir.absolutePath/airbyte-connector-builder-server/src/main/openapi/openapi.yaml"
     outputDir = "$buildDir/airbyte_connector_builder_server"
 
-    generatorName = "python"
-    packageName = "airbyte_connector_builder_server"
+    generatorName = "python-fastapi"
+    configFile = "$projectDir/openapi/generator_config.yaml"
+    templateDir = "$projectDir/openapi/templates"
+    packageName = "connector_builder.generated"
+
+    // After we generate, we're only interested in the API declaration and the generated pydantic models.
+    // So we copy those from the build/ directory
+    doLast {
+        def sourceDir = "$generatedCodeDir/src/connector_builder/generated/"
+        def targetDir = "$projectDir/connector_builder/generated"
+        mkdir targetDir
+        copy {
+            from "$sourceDir/apis"
+            include "*_interface.py", "__init__.py"
+            into "$targetDir/apis"
+        }
+        copy {
+            from "$sourceDir/models"
+            include "*.py"
+            into "$targetDir/models"
+        }
+    }
 }
 
-blackFormat.dependsOn generateApiServer
-isortFormat.dependsOn generateApiServer
-flakeCheck.dependsOn generateApiServer
-installReqs.dependsOn generateApiServer
+project.build.dependsOn(generateOpenApiPythonServer)
+

airbyte-connector-builder-server/connector_builder/entrypoint.py

@@ -2,29 +2,14 @@
 # Copyright (c) 2022 Airbyte, Inc., all rights reserved.
 #
 
-from typing import Union
-
+from connector_builder.generated.apis.default_api_interface import initialize_router
+from connector_builder.impl.default_api import DefaultApiImpl
 from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-
-app = FastAPI()
-
-origins = ["*"]
 
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=origins,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
+app = FastAPI(
+    title="Connector Builder Server API",
+    description="Connector Builder Server API ",
+    version="1.0.0",
 )
 
-
-@app.get("/")
-def read_root():
-    return {"Hello": "fastapi"}
-
-
-@app.get("/items/{item_id}")
-def read_item(item_id: int, q: Union[str, None] = None):
-    return {"item_id": item_id, "q": q}
+app.include_router(initialize_router(DefaultApiImpl()))

airbyte-connector-builder-server/setup.py

@@ -41,24 +41,9 @@
     },
     packages=find_packages(exclude=("unit_tests", "integration_tests", "docs")),
     package_data={},
-    install_requires=[
-        "click~=8.0.3",
-        "fastapi>=0.68.0,<0.69.0",
-        "pydantic>=1.8.0,<2.0.0",
-        "uvicorn>=0.15.0,<0.16.0",
-        # f"airbyte_connector_builder @ file://{os.getcwd()}/build/airbyte_connector_builder", # FIXME: This should point to the server interface generated by the openAPI generator
-        "jinja2~=3.0.3",
-        "deepdiff~=5.7.0",
-        "pyyaml~=6.0",
-        "analytics-python~=1.4.0",
-        "python-slugify~=6.1.2",
-    ],
+    install_requires=["fastapi", "uvicorn"],
     python_requires=">=3.9.11",
     extras_require={
         "tests": ["MyPy~=0.812", "pytest~=6.2.5", "pytest-cov", "pytest-mock", "pytest-recording", "requests-mock", "pre-commit"],
-        "sphinx-docs": [
-            "Sphinx~=4.2",
-            "sphinx-rtd-theme~=1.0",
-        ],
     },
 )