fastapi-startkit 0.22.0__tar.gz → 0.25.0__tar.gz

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fastapi-startkit
-Version: 0.22.0
+Version: 0.25.0
 Summary: Fastapi Starter kit components
 Author: Bedram Tamang
 Author-email: Bedram Tamang <tmgbedu@gmail.com>

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-startkit"
-version = "0.22.0"
+version = "0.25.0"
 description = "Fastapi Starter kit components"
 authors = [
     {name = "Bedram Tamang", email = "tmgbedu@gmail.com"}

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/__init__.py

@@ -2,4 +2,4 @@ from .application import Application
 from .console import ConsoleApplication
 from .configuration.config import Config
 
-__all__ = ["Application", "Config"]
+__all__ = ["Application", "ConsoleApplication", "Config"]

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/fastapi/__init__.py

@@ -1,5 +1,6 @@
 from .providers.fastapi_provider import FastAPIProvider
 from .routers.router import Router
 from .requests.model import RequestModel
+from .config import FastAPIConfig
 
-__all__ = ["FastAPIProvider", "Router", "RequestModel"]
+__all__ = ["FastAPIProvider", "Router", "RequestModel", "FastAPIConfig"]

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/fastapi/commands/serve_command.py

@@ -11,22 +11,22 @@ class ServeCommand(Command):
             "port",
             "p",
             flag=False,
-            default="8000",
-            description="The port to serve the application on",
+            default=None,
+            description="The port to serve the application on (overrides fastapi config)",
         ),
         option(
             "host",
             None,
             flag=False,
-            default="127.0.0.1",
-            description="The host to bind to",
+            default=None,
+            description="The host to bind to (overrides fastapi config)",
         ),
         option(
             "reload",
             "r",
             flag=False,
-            default=True,
-            description="Enable auto-reload on code changes",
+            default=None,
+            description="Enable auto-reload on code changes (overrides fastapi config)",
         ),
         option(
             "app",
@@ -39,12 +39,20 @@ class ServeCommand(Command):
 
     def handle(self):
         import uvicorn
+        from fastapi_startkit import Config
         from fastapi_startkit.container import Container
 
-        port = int(self.option("port"))
-        host = self.option("host")
+        # Resolve server settings: CLI flag > fastapi config > uvicorn default (None)
+        cfg_host = Config.get("fastapi.host", "127.0.0.1")
+        cfg_port = Config.get("fastapi.port", 8000)
+        cfg_reload = Config.get("fastapi.reload", True)
+        cfg_reload_dirs = Config.get("fastapi.reload_dirs") or None
+        cfg_reload_excludes = Config.get("fastapi.reload_excludes") or None
+
+        host = self.option("host") or cfg_host
+        port = int(self.option("port") or cfg_port)
+        reload = cfg_reload if self.option("reload") is None else self.option("reload")
         app = self.option("app")
-        reload = self.option("reload")
 
         exist = self.is_app_exist()
 
@@ -59,11 +67,13 @@ class ServeCommand(Command):
             kwargs.update(
                 {
                     "app": app,
-                    "reload": reload,
                     "factory": True,
-                    "reload_excludes": ["*.log", "tests/*"],
                 }
             )
+            if cfg_reload_dirs is not None:
+                kwargs["reload_dirs"] = cfg_reload_dirs
+            if cfg_reload_excludes is not None:
+                kwargs["reload_excludes"] = cfg_reload_excludes
 
             self.line(
                 f"<info>Starting Uvicorn server on {host}:{port} [{app}]...</info>"

fastapi_startkit-0.25.0/src/fastapi_startkit/fastapi/config/__init__.py

@@ -0,0 +1,3 @@
+from .fastapi import FastAPIConfig
+
+__all__ = ["FastAPIConfig"]

fastapi_startkit-0.25.0/src/fastapi_startkit/fastapi/config/fastapi.py

@@ -0,0 +1,24 @@
+import dataclasses
+
+from fastapi_startkit.environment import env
+
+
+@dataclasses.dataclass
+class FastAPIConfig:
+    """Server configuration for the uvicorn/FastAPI serve command.
+
+    All fields can be overridden via environment variables or by publishing a
+    ``config/fastapi.py`` file in the application root.
+    """
+
+    host: str = dataclasses.field(default_factory=lambda: env("APP_HOST", "127.0.0.1"))
+    port: int = dataclasses.field(default_factory=lambda: env("APP_PORT", 8000))
+    reload: bool = dataclasses.field(default_factory=lambda: env("APP_RELOAD", True))
+    reload_dirs: list | None = None
+    reload_excludes: list = dataclasses.field(
+        default_factory=lambda: [
+            "*.log",
+            "tests/*",
+            "node_modules/*",
+        ]
+    )

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/fastapi/providers/fastapi_provider.py

@@ -2,12 +2,18 @@ from fastapi_startkit.fastapi.exceptions import HTTPExceptionHandler, Validation
 from fastapi import FastAPI
 
 from fastapi_startkit.fastapi.commands import ServeCommand
+from fastapi_startkit.fastapi.config import FastAPIConfig
 from fastapi_startkit.providers import Provider
 
 
 class FastAPIProvider(Provider):
+    provider_key = "fastapi"
+
     def register(self) -> None:
         """Create a FastAPI instance and register routers."""
+        config = self.resolve_config(FastAPIConfig)
+        self.merge_config_from(config, self.provider_key)
+
         fastapi = FastAPI(
             title="Jobins AI Agent (LangChain)",
             version="1.0.0",
@@ -16,9 +22,16 @@ class FastAPIProvider(Provider):
         self.app.use_fastapi(fastapi)
 
     def boot(self):
+        import os
+
         self.commands([ServeCommand])
         self._register_exception_handlers()
 
+        source = os.path.abspath(
+            os.path.join(os.path.dirname(__file__), "../config/fastapi.py")
+        )
+        self.publishes({source: "config/fastapi.py"})
+
     def _register_exception_handlers(self):
         """Wire exception_manager as a catch-all handler for all exceptions."""
         from fastapi import HTTPException

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/Blueprint.py

@@ -743,7 +743,7 @@ class Blueprint:
         self._last_column = _columns
         return self
 
-    def to_sql(self):
+    async def to_sql(self):
         """Compiles the blueprint class into a sql statement.
 
         Returns:
@@ -754,13 +754,10 @@ class Blueprint:
         elif self._action == "create_table_if_not_exists":
             return self.platform().compile_create_sql(self.table, if_not_exists=True)
         else:
-            if not self._dry and self.table.from_table is None:
-                # get current table schema
-                table = self.platform().get_current_schema(
+            if self.table.from_table is None:
+                self.table.from_table = await self.platform().get_current_schema(
                     self.connection, self.table.name, schema=self.schema
                 )
-                self.table.from_table = table
-
             return self.platform().compile_alter_sql(self.table)
 
     def __enter__(self):
@@ -781,12 +778,11 @@ class Blueprint:
     async def __aenter__(self):
         return self
 
-    # TODO: review
     async def __aexit__(self, exc_type, exc_value, exc_traceback):
         if self._dry:
             return
 
-        sql = self.to_sql()
+        sql = await self.to_sql()
         if isinstance(sql, list):
             for q in sql:
                 await self.connection.statement(q, ())

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/platforms/MySQLPlatform.py

@@ -435,10 +435,10 @@ class MySQLPlatform(Platform):
     def compile_get_all_tables(self, database, schema=None):
         return f"SELECT table_name FROM information_schema.tables WHERE table_schema = '{database}'"
 
-    def get_current_schema(self, connection, table_name, schema=None):
+    async def get_current_schema(self, connection, table_name, schema=None):
         table = Table(table_name)
         sql = f"DESCRIBE {table_name}"
-        result = connection.query(sql, ())
+        result = await connection.select(sql, ())
         reversed_type_map = {v: k for k, v in self.type_map.items()}
 
         for column in result:

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/platforms/PostgresPlatform.py

@@ -492,7 +492,7 @@ class PostgresPlatform(Platform):
     def compile_get_all_tables(self, database=None, schema=None):
         return f"SELECT table_name FROM information_schema.tables WHERE table_schema = '{schema or 'public'}' AND table_catalog = '{database}' AND table_type = 'BASE TABLE'"
 
-    def get_current_schema(self, connection, table_name, schema=None):
+    async def get_current_schema(self, connection, table_name, schema=None):
         sql = self.table_information_string().format(
             table=table_name, schema=schema or "public"
         )
@@ -501,7 +501,7 @@ class PostgresPlatform(Platform):
         reversed_type_map.update(self.table_info_map)
         table = Table(table_name)
 
-        result = connection.query(sql, ())
+        result = await connection.select(sql, ())
         for column in result:
             column_type = reversed_type_map.get(column["data_type"].upper())
 

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/platforms/SQLitePlatform.py

@@ -367,13 +367,13 @@ class SQLitePlatform(Platform):
 
         return names
 
-    def get_current_schema(self, connection, table_name, schema=None):
+    async def get_current_schema(self, connection, table_name, schema=None):
         sql = f"PRAGMA table_info({table_name})"
 
         reversed_type_map = {v: k for k, v in self.type_map.items()}
         table = Table(table_name)
 
-        result = connection.query(sql, ())
+        result = await connection.select(sql, ())
         for column in result:
             column_type = self.get_column_type(
                 reversed_type_map, column["type"].upper()

{fastapi_startkit-0.22.0 → fastapi_startkit-0.25.0}/src/fastapi_startkit/masoniteorm/schema/schema.py

@@ -4,6 +4,48 @@ from fastapi_startkit.masoniteorm.schema.TableDiff import TableDiff
 
 
 class Schema:
+    _type_hints_map = {
+        "string": str,
+        "char": str,
+        "big_increments": int,
+        "integer": int,
+        "big_integer": int,
+        "tiny_integer": int,
+        "small_integer": int,
+        "medium_integer": int,
+        "integer_unsigned": int,
+        "big_integer_unsigned": int,
+        "tiny_integer_unsigned": int,
+        "small_integer_unsigned": int,
+        "medium_integer_unsigned": int,
+        "increments": int,
+        "uuid": str,
+        "binary": bytes,
+        "boolean": bool,
+        "decimal": float,
+        "double": float,
+        "enum": str,
+        "text": str,
+        "tiny_text": str,
+        "float": float,
+        "geometry": str,
+        "json": dict,
+        "jsonb": bytes,
+        "inet": str,
+        "cidr": str,
+        "macaddr": str,
+        "long_text": str,
+        "point": str,
+        "time": str,
+        "timestamp": str,
+        "date": str,
+        "year": str,
+        "datetime": str,
+        "tiny_increments": int,
+        "unsigned": int,
+        "unsigned_integer": int,
+    }
+
     def __init__(self, manager) -> None:
         self._manager = manager
         self._connection = None