coloco 0.1.3__tar.gz → 0.2.0__tar.gz

{coloco-0.1.3 → coloco-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coloco
-Version: 0.1.3
+Version: 0.2.0
 Summary: A kit for creating FastAPI + Svelte applications
 Author-Email: Channel Cat <channelcat@gmail.com>
 License: MIT

{coloco-0.1.3 → coloco-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coloco"
-version = "0.1.3"
+version = "0.2.0"
 description = "A kit for creating FastAPI + Svelte applications"
 authors = [
     { name = "Channel Cat", email = "channelcat@gmail.com" },

{coloco-0.1.3 → coloco-0.2.0}/src/coloco/cli/api.py

@@ -1,29 +1,26 @@
+from ..app import ColocoApp
 from importlib import import_module
-import typer
+import os
 from rich import print
+import sys
+import typer
 import uvicorn
-from ..app import ColocoApp
 
 
 app = typer.Typer()
 
 
-@app.command()
-def serve(
-    app: str = "main.app",
-    host: str = "127.0.0.1",
-    port: int = 80,
-    log_level: str = "info",
-    reload=False,
-):
+def _verify_app(app: str):
     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]"
         )
         raise typer.Abort()
-
+    
     module_name, var_name = app.rsplit(".", 1)
     try:
+        # Needed for when running the binary
+        sys.path.append(os.getcwd())
         module = import_module(module_name)
     except ImportError:
         print(f"[red]Module or python file {module_name} not found[/red]")
@@ -38,7 +35,17 @@ def serve(
     if not isinstance(var, ColocoApp):
         print(f"[red]{var_name} is not a ColocoApp.  Please use create_app[/red]")
         raise typer.Abort()
+    
+    return True
 
+def _serve(
+    app: str = "main.app",
+    host: str = "127.0.0.1",
+    port: int = 80,
+    log_level: str = "info",
+    reload=False,
+):
+    module_name, var_name = app.rsplit(".", 1)
     uvicorn.run(
         f"{module_name}:{var_name}.api.service",
         host=host,
@@ -46,3 +53,14 @@ def serve(
         reload=reload,
         log_level=log_level,
     )
+
+@app.command()
+def serve(
+    app: str = "main.app",
+    host: str = "127.0.0.1",
+    port: int = 80,
+    log_level: str = "info",
+    reload=False,
+):
+    _verify_app(app)
+    _serve(app=app, host=host, port=port, log_level=log_level, reload=reload)

{coloco-0.1.3 → coloco-0.2.0}/src/coloco/cli/createapp.py

@@ -1,7 +1,6 @@
-import typer
 from rich import print
+from .node import install
 import os
-import shutil
 
 
 def createapp(name: str):
@@ -9,7 +8,6 @@ def createapp(name: str):
     template_dir = f"{current_dir}/../templates/standard"
     install_dir = f"{os.getcwd()}/{name}"
     print(f"Creating app {name}...")
-    print(f"App created in {install_dir}")
 
     template_vars = {
         "project_name": name,
@@ -34,3 +32,7 @@ def createapp(name: str):
                     os.path.join(install_dir, relative_path, file[:-4]), "w"
                 ) as f:
                     f.write(content)
+
+    print(f"App created in {install_dir}")
+
+    print(f"\nRun [green]coloco dev[/green] from [yellow]{name}[/yellow] to start the app.")

{coloco-0.1.3 → coloco-0.2.0}/src/coloco/cli/dev.py

@@ -1,11 +1,20 @@
+from .api import _verify_app, _serve
+from .node import install
+import os
 from rich import print
-from .api import serve
 from subprocess import Popen
 
 
 def dev(app: str = "main.app", host: str = "127.0.0.1"):
+    _verify_app(app)
+
+    # Check Node Modules
+    if not os.path.exists(os.path.join(os.getcwd(), "node_modules")):
+        print("[yellow]Node modules not found, installing...[/yellow]")
+        install()
+    
     node = Popen([f"npm run dev"], cwd="+node", shell=True)
-    serve(
+    _serve(
         app=app,
         host=host,
         port=5172,

{coloco-0.1.3 → coloco-0.2.0}/src/coloco/templates/docker/Dockerfile-tpl

@@ -9,10 +9,6 @@ WORKDIR /app
 ADD ./requirements.txt /app/requirements.txt
 RUN python -m pip install -r /app/requirements.txt
 
-# TODO: remove this when coloco is a package
-ADD ./coloco/requirements.txt /app/coloco/requirements.txt
-RUN python -m pip install -r /app/coloco/requirements.txt
-
 # Node Install
 RUN mkdir /.npm && chown -R 1000:1000 "/.npm"
 ADD ./+node/package.json /app/package.json

{coloco-0.1.3 → coloco-0.2.0}/src/coloco/templates/standard/+node/package.json-tpl

@@ -11,10 +11,9 @@
   },
   "devDependencies": {
     "@coloco/api-client-svelte": "^0.1.1",
-    "@coloco/router": "^0.1.1",
+    "@coloco/router": "^0.1.2",
     "@hey-api/client-fetch": "^0.8.2",
     "@hey-api/openapi-ts": "^0.64.7",
-    "@mateothegreat/svelte5-router": "^0.1.38",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
     "@tsconfig/svelte": "^5.0.4",
     "@types/node": "^22.13.4",