coloco 0.3.0__tar.gz → 0.3.2__tar.gz

{coloco-0.3.0 → coloco-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coloco
-Version: 0.3.0
+Version: 0.3.2
 Summary: A kit for creating FastAPI + Svelte applications
 Author-Email: Channel Cat <channelcat@gmail.com>
 License: MIT
@@ -9,7 +9,7 @@ Requires-Dist: aerich[toml]==0.8.1
 Requires-Dist: fastapi==0.115.0
 Requires-Dist: PyJWT==2.10.1
 Requires-Dist: tortoise-orm[asyncpg]==0.24.0
-Requires-Dist: type-less==0.1.4
+Requires-Dist: type-less==0.1.6
 Requires-Dist: typer==0.15.2
 Requires-Dist: uvicorn==0.31.0
 Description-Content-Type: text/markdown
@@ -26,7 +26,7 @@ Example:
 from coloco import api
 
 @api
-def test(name: str) -> str:
+def test(name: str):
     return f"Hello {name}!"
 
 ```

{coloco-0.3.0 → coloco-0.3.2}/README.md

@@ -10,7 +10,7 @@ Example:
 from coloco import api
 
 @api
-def test(name: str) -> str:
+def test(name: str):
     return f"Hello {name}!"
 
 ```

{coloco-0.3.0 → coloco-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coloco"
-version = "0.3.0"
+version = "0.3.2"
 description = "A kit for creating FastAPI + Svelte applications"
 authors = [
     { name = "Channel Cat", email = "channelcat@gmail.com" },
@@ -10,7 +10,7 @@ dependencies = [
     "fastapi==0.115.0",
     "PyJWT==2.10.1",
     "tortoise-orm[asyncpg]==0.24.0",
-    "type-less==0.1.4",
+    "type-less==0.1.6",
     "typer==0.15.2",
     "uvicorn==0.31.0",
 ]

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/api.py

@@ -11,18 +11,25 @@ from .lifespan import execute_lifespan, register_lifespan
 import logging
 from os import environ
 from type_less import fill_type_hints
+from threading import Thread
 
 
 logging.basicConfig(level=logging.INFO)
 
 
-@asynccontextmanager
-async def generate_openapi(app: FastAPI):
-    logging.info("Generating OpenAPI schema...")
+def _generate_openapi_thread(app: FastAPI):
+    logging.info("Generating OpenAPI schema in thread...")
     generate_openapi_schema(app)
     generate_openapi_code(host=f"http://localhost:5172", diff_files=True)
 
+
+@asynccontextmanager
+async def generate_openapi(app: FastAPI):
+    generate_api_thread = Thread(target=_generate_openapi_thread, args=(app,))
+    generate_api_thread.start()
     yield
+    # TODO: possibly use a process and terminate instead?
+    generate_api_thread.join()
 
 
 def create_api(is_dev: bool = False):
@@ -72,12 +79,15 @@ def api(func):
 def _add_global_route(args, kwargs, func, method: str):
     fill_type_hints(func, use_literals=True)
 
+    module_name = func.__module__.lstrip("src.app")
+
     # Prepend module name to path
     path = args[0] if args else kwargs.get("path", "")
     path = (
         # TODO: Make this configurable
         "/api/"
-        + func.__module__.rsplit(".", 1)[0].replace(".", "/")
+        # TODO: Make this read project configuration, probably need to add routes after running
+        + module_name.rsplit(".", 1)[0].replace(".", "/")
         + ("" if path.startswith("/") else "/")
         + path
     )
@@ -90,7 +100,7 @@ def _add_global_route(args, kwargs, func, method: str):
         *args,
         **{
             **kwargs,
-            "summary": (kwargs.get("summary", "") + f" ({func.__module__})").strip(),
+            "summary": (kwargs.get("summary", "") + f" ({module_name})").strip(),
             "methods": [method],
         },
     )(func)

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/app.py

@@ -66,9 +66,6 @@ def create_app(name: str, database_url: str = None) -> ColocoApp:
             continue
 
     api.include_router(global_router)
-    from fastapi.staticfiles import StaticFiles
-
-    api.mount("/assets", StaticFiles(directory="dist/app/assets"), name="assets")
 
     # Production mode serves dist
     if mode == "prod":

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/cli/api.py

@@ -12,7 +12,7 @@ import uvicorn
 app = typer.Typer()
 
 
-def _verify_app(app: str = "main.app") -> ColocoApp:
+def _verify_app(app: str = "src.main.app") -> ColocoApp:
     if not "." in app:
         print(
             "[red]App should be the name of a variable in a python file, example: main.py -> api = main.api[/red]"
@@ -24,7 +24,7 @@ def _verify_app(app: str = "main.app") -> ColocoApp:
         # Needed for when running the binary
         sys.path.append(os.getcwd())
         module = import_module(module_name)
-    except ImportError:
+    except ModuleNotFoundError:
         print(f"[red]Module or python file {module_name} not found[/red]")
         raise typer.Abort()
 

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/cli/dev.py

@@ -1,11 +1,15 @@
 from .api import _verify_app, _serve
+from ..config import get_coloco_config
 from .node import install, _setup_dev_env
 import os
 from rich import print
 from subprocess import Popen
 
 
-def dev(app: str = "main.app", host: str = "127.0.0.1"):
+def dev(app: str = None, host: str = "127.0.0.1"):
+    if not app:
+        app = get_coloco_config().get("app") or "src.main.app"
+
     _verify_app(app)
 
     # Check Node Modules
@@ -14,7 +18,7 @@ def dev(app: str = "main.app", host: str = "127.0.0.1"):
         install()
 
     _setup_dev_env()
-    node = Popen([f"npm run dev"], cwd="+node", shell=True)
+    node = Popen([f"npm run dev"], shell=True)
     _serve(
         app=app,
         host=host,

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/cli/node.py

@@ -9,31 +9,17 @@ app = typer.Typer()
 
 def _run_npm(command):
     # if not exists +node/package.json, raise error
-    if not os.path.exists("+node/package.json"):
+    if not os.path.exists("package.json"):
         print(
-            "[red]Error: +node/package.json not found.  Please ensure you are in a coloco project directory.[/red]"
+            "[red]Error: package.json not found.  Please ensure you are in a coloco project directory.[/red]"
         )
         raise typer.Abort()
 
-    # copy +node/package.json to /package.json
-    shutil.copyfile("+node/package.json", "package.json")
-    if os.path.exists("+node/package-lock.json"):
-        shutil.copyfile("+node/package-lock.json", "package-lock.json")
-
     try:
         # run npm install
         subprocess.run(command, cwd=".")
-
-        # move package.json and package-lock.json back to +node
-        shutil.move("package.json", "+node/package.json")
-        shutil.move("package-lock.json", "+node/package-lock.json")
     except Exception as e:
         print(f"[red]Error: {e}[/red]")
-        try:
-            os.remove("package.json")
-            os.remove("package-lock.json")
-        except Exception:
-            pass
         raise typer.Abort()
 
 
@@ -73,7 +59,7 @@ def dev():
     """Runs the node dev server"""
     print("[green]Running node dev server...[/green]")
     _setup_dev_env()
-    subprocess.run(["npm", "run", "dev"], cwd="+node")
+    subprocess.run(["npm", "run", "dev"], cwd=".")
 
 
 @app.command()
@@ -81,4 +67,4 @@ def build(dir: str = None):
     """Runs the node dev server"""
     print("[green]Building node app...[/green]")
 
-    subprocess.run(["npm", "run", "build"], cwd="+node")
+    subprocess.run(["npm", "run", "build"], cwd=".")

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/codegen.py

@@ -45,20 +45,18 @@ def generate_openapi_schema(app: FastAPI, path="/tmp/openapi.json"):
 def generate_openapi_code(
     host,
     spec_path="/tmp/openapi.json",
-    output_dir="./+app/.generated/client",
+    output_dir="./src/app/.generated/client",
     diff_files=False,
 ):
     temp_dir = "/tmp/backend_api"
     output_path = os.path.join(os.getcwd(), output_dir)
-    cwd_path = os.path.join(os.getcwd(), "+node")
 
     run(
-
         f"npx openapi-ts "
         f"--base {host} "
         f"--input {spec_path} "
         f"--output {temp_dir if diff_files else output_path} ".split(),
-        cwd=cwd_path,
+        cwd=os.getcwd(),
     )
     if diff_files:
         compare_and_copy(temp_dir, output_dir)

coloco-0.3.2/src/coloco/config.py

@@ -0,0 +1,18 @@
+import tomllib
+import os
+
+
+def get_coloco_config():
+    # Read project toml
+    if not os.path.exists("pyproject.toml"):
+        raise LookupError("pyproject.toml not found")
+    with open("pyproject.toml", "rb") as f:
+        config = tomllib.load(f)
+
+    # Get coloco config
+    coloco_config = config.get("tool", {}).get("coloco")
+    if not coloco_config:
+        raise LookupError(
+            "coloco config not found in pyproject.toml under [tool.coloco]"
+        )
+    return coloco_config

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/templates/standard/+node/package.json-tpl

@@ -10,8 +10,8 @@
     "check": "svelte-check --tsconfig ./tsconfig.app.json && tsc -p tsconfig.node.json"
   },
   "devDependencies": {
-    "@coloco/api-client-svelte": "^0.3.0",
-    "@coloco/router": "^0.1.5",
+    "@coloco/api-client-svelte": "^0.4.10",
+    "@coloco/router": "^0.1.15",
     "@hey-api/client-fetch": "^0.8.2",
     "@hey-api/openapi-ts": "^0.64.7",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",

{coloco-0.3.0 → coloco-0.3.2}/src/coloco/templates/standard/example/index.svelte-tpl

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { test } from "./api";
 
-  const results = test({ query: { name: "Testy McTesterson" } });
+  const results = test({ name: "Testy McTesterson" });
 </script>
 
 Calling server... {$results.loading} - {$results.data} - {$results.error}