refactor: move code to avoid conflicts with "http" namespace

brycedrennan · Oct 11, 2023 · 6cd519c · 6cd519c
1 parent 703fb6e
commit 6cd519c
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 7 deletions.
diff --git a/imaginairy/cli/run_api.py b/imaginairy/cli/run_api.py
@@ -10,7 +10,7 @@ def run_server_cmd():
     """Run a HTTP API server."""
     import uvicorn
 
-    from imaginairy.http.app import app
+    from imaginairy.http_app.app import app
     from imaginairy.log_utils import configure_logging
 
     configure_logging(level="DEBUG")

diff --git a/imaginairy/http/__init__.py → imaginairy/http_app/__init__.py b/imaginairy/http/__init__.py → imaginairy/http_app/__init__.py
diff --git a/imaginairy/http/app.py → imaginairy/http_app/app.py b/imaginairy/http/app.py → imaginairy/http_app/app.py
@@ -10,8 +10,8 @@
 from fastapi.responses import FileResponse, JSONResponse, StreamingResponse
 from fastapi.staticfiles import StaticFiles
 
-from imaginairy.http.stablestudio import routes
-from imaginairy.http.utils import generate_image
+from imaginairy.http_app.stablestudio import routes
+from imaginairy.http_app.utils import generate_image
 from imaginairy.schema import ImaginePrompt
 
 logger = logging.getLogger(__name__)

diff --git a/imaginairy/http/stablestudio/__init__.py → imaginairy/http_app/stablestudio/__init__.py b/imaginairy/http/stablestudio/__init__.py → imaginairy/http_app/stablestudio/__init__.py
diff --git a/...nairy/http/stablestudio/dist/Checkers.png → ...y/http_app/stablestudio/dist/Checkers.png b/...nairy/http/stablestudio/dist/Checkers.png → ...y/http_app/stablestudio/dist/Checkers.png
diff --git a/...iry/http/stablestudio/dist/DummyImage.png → ...http_app/stablestudio/dist/DummyImage.png b/...iry/http/stablestudio/dist/DummyImage.png → ...http_app/stablestudio/dist/DummyImage.png
diff --git a/imaginairy/http/stablestudio/dist/Inter.ttf → ...airy/http_app/stablestudio/dist/Inter.ttf b/imaginairy/http/stablestudio/dist/Inter.ttf → ...airy/http_app/stablestudio/dist/Inter.ttf
diff --git a/imaginairy/http/stablestudio/dist/LICENSE → ...inairy/http_app/stablestudio/dist/LICENSE b/imaginairy/http/stablestudio/dist/LICENSE → ...inairy/http_app/stablestudio/dist/LICENSE
diff --git a/...p/stablestudio/dist/PluginWithManifest.js → ...p/stablestudio/dist/PluginWithManifest.js b/...p/stablestudio/dist/PluginWithManifest.js → ...p/stablestudio/dist/PluginWithManifest.js
diff --git a/...tablestudio/dist/PluginWithoutManifest.js → ...tablestudio/dist/PluginWithoutManifest.js b/...tablestudio/dist/PluginWithoutManifest.js → ...tablestudio/dist/PluginWithoutManifest.js
diff --git a/...ablestudio/dist/assets/index-03379660.css → ...ablestudio/dist/assets/index-03379660.css b/...ablestudio/dist/assets/index-03379660.css → ...ablestudio/dist/assets/index-03379660.css
diff --git a/...tablestudio/dist/assets/index-80230e31.js → ...tablestudio/dist/assets/index-80230e31.js b/...tablestudio/dist/assets/index-80230e31.js → ...tablestudio/dist/assets/index-80230e31.js
diff --git a/...inairy/http/stablestudio/dist/favicon.svg → ...ry/http_app/stablestudio/dist/favicon.svg b/...inairy/http/stablestudio/dist/favicon.svg → ...ry/http_app/stablestudio/dist/favicon.svg
diff --git a/imaginairy/http/stablestudio/dist/index.html → ...iry/http_app/stablestudio/dist/index.html b/imaginairy/http/stablestudio/dist/index.html → ...iry/http_app/stablestudio/dist/index.html
diff --git a/imaginairy/http/stablestudio/dist/logo.png → ...nairy/http_app/stablestudio/dist/logo.png b/imaginairy/http/stablestudio/dist/logo.png → ...nairy/http_app/stablestudio/dist/logo.png
diff --git a/imaginairy/http/stablestudio/models.py → imaginairy/http_app/stablestudio/models.py b/imaginairy/http/stablestudio/models.py → imaginairy/http_app/stablestudio/models.py
@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel, Extra, Field, HttpUrl, validator
 
-from imaginairy.http.utils import Base64Bytes
+from imaginairy.http_app.utils import Base64Bytes
 from imaginairy.schema import ImaginePrompt
 
 

diff --git a/imaginairy/http/stablestudio/routes.py → imaginairy/http_app/stablestudio/routes.py b/imaginairy/http/stablestudio/routes.py → imaginairy/http_app/stablestudio/routes.py
@@ -3,21 +3,21 @@
 from fastapi import APIRouter
 from fastapi.concurrency import run_in_threadpool
 
-from imaginairy.http.stablestudio.models import (
+from imaginairy.http_app.stablestudio.models import (
     StableStudioBatchRequest,
     StableStudioBatchResponse,
     StableStudioImage,
     StableStudioModel,
     StableStudioSampler,
 )
-from imaginairy.http.utils import generate_image_b64
+from imaginairy.http_app.utils import generate_image_b64
 
 router = APIRouter()
 
 
 @router.post("/generate", response_model=StableStudioBatchResponse)
 async def generate(studio_request: StableStudioBatchRequest):
-    from imaginairy.http.app import gpu_lock
+    from imaginairy.http_app.app import gpu_lock
 
     generated_images = []
     imagine_prompt = studio_request.input.to_imagine_prompt()

diff --git a/imaginairy/http/utils.py → imaginairy/http_app/utils.py b/imaginairy/http/utils.py → imaginairy/http_app/utils.py