fastapi-startkit 0.24.0__tar.gz → 0.26.0__tar.gz

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.0}/PKG-INFO

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

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.0}/pyproject.toml

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

fastapi_startkit-0.26.0/src/fastapi_startkit/masoniteorm/__init__.py

@@ -0,0 +1,32 @@
+from .config.config import MySQLConfig, PostgresConfig, SQLiteConfig
+from .facades import DB
+from .migrations.Migration import Migration
+from .migrations.Migrator import Migrator
+from .models import Model
+from .models.fields import CreatedAtField, DateTimeField, Field, ModelField, UpdatedAtField
+from .providers import DatabaseProvider
+from .relationships import BelongsTo, BelongsToMany, HasMany, HasManyThrough, HasOne, HasOneThrough, MorphTo
+
+__all__ = [
+    "DatabaseProvider",
+    "PostgresConfig",
+    "MySQLConfig",
+    "SQLiteConfig",
+    "Model",
+    "DB",
+    "Migration",
+    "Migrator",
+    "ModelField",
+    "DateTimeField",
+    "CreatedAtField",
+    "UpdatedAtField",
+    "Field",
+    # Relationships
+    "HasOne",
+    "BelongsTo",
+    "HasMany",
+    "HasManyThrough",
+    "BelongsToMany",
+    "HasOneThrough",
+    "MorphTo",
+]

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.0}/src/fastapi_startkit/masoniteorm/commands/stubs/table_migration.stub

@@ -1,6 +1,6 @@
 """__MIGRATION_NAME__ Migration."""
 
-from fastapi_startkit.masoniteorm.migrations import Migration
+from fastapi_startkit.masoniteorm import Migration
 
 
 class __MIGRATION_NAME__(Migration):

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.0}/src/fastapi_startkit/masoniteorm/models/attribute.py

@@ -105,4 +105,7 @@ class Attribute:
         }
 
     def get_attributes_for_insert(self) -> dict:
-        return {**self._attributes, **self._dirty_attributes}
+        # _dirty_attributes already went through set_attribute (casts applied on assignment).
+        # _attributes is set raw via new_model_instance, so apply set casts here.
+        casted = {k: self.caster.set(k, v) for k, v in self._attributes.items()}
+        return {**casted, **self._dirty_attributes}

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.0}/src/fastapi_startkit/masoniteorm/models/caster.py

@@ -111,6 +111,66 @@ class DecimalCast(BaseCast):
         return str(value)
 
 
+class TimeCast(BaseCast):
+    """Casts a value to datetime.time; stored as HH:MM:SS string"""
+
+    def get(self, value):
+        if not value:
+            return None
+        if isinstance(value, datetime.time):
+            return value
+        return datetime.time.fromisoformat(str(value))
+
+    def set(self, value):
+        if not value:
+            return None
+        if isinstance(value, datetime.time):
+            return value.strftime("%H:%M:%S")
+        return str(value)
+
+
+class TimeDeltaCast(BaseCast):
+    """Casts a value to datetime.timedelta; stored as total seconds"""
+
+    def get(self, value):
+        if value is None:
+            return None
+        if isinstance(value, datetime.timedelta):
+            return value
+        return datetime.timedelta(seconds=float(value))
+
+    def set(self, value):
+        if value is None:
+            return None
+        if isinstance(value, datetime.timedelta):
+            return value.total_seconds()
+        return float(value)
+
+
+@dataclass
+class ModelCast(BaseCast):
+    model_class: type = field(default=None)
+
+    def get(self, value):
+        if value is None:
+            return None
+        if isinstance(value, self.model_class):
+            return value
+        data = json.loads(value) if isinstance(value, str) else value
+        return self.model_class(**data)
+
+    def set(self, value) -> Optional[str]:
+        if value is None:
+            return None
+        if isinstance(value, self.model_class):
+            if hasattr(value, "model_dump_json"):
+                return value.model_dump_json()
+            return json.dumps(value.__dict__)
+        if isinstance(value, dict):
+            return json.dumps(value)
+        return value
+
+
 class Caster:
     casts = {}
 
@@ -121,6 +181,8 @@ class Caster:
         "float": FloatCast,
         "date": DateCast,
         "decimal": DecimalCast,
+        "time": TimeCast,
+        "timedelta": TimeDeltaCast,
     }
 
     IGNORE_CASTS = ["caster", "db_manager"]
@@ -156,21 +218,26 @@ class Caster:
         annotations = {
             k: v for k, v in annotations.items() if k not in cls.IGNORE_CASTS
         }
-        from .fields import FieldDescriptor
+        from .fields import ModelField, FieldDescriptor
 
         # 1. Collect all potential fields (annotations + descriptors)
         all_field_names = set(annotations.keys())
         descriptors = {}
-        for name, attr in cls.__dict__.items():
-            if isinstance(attr, FieldDescriptor):
+        for name, attr in model.__dict__.items():
+            if isinstance(attr, (FieldDescriptor, ModelField)):
                 all_field_names.add(name)
                 descriptors[name] = attr
 
         casts = {}
         for field_name in all_field_names:
-            # 2. Get Type Hint and FieldInfo
             typ = annotations.get(field_name) or "str"
             descriptor = descriptors.get(field_name, None)
+
+            # AttributeField: use the type annotation as the model class
+            if isinstance(descriptor, ModelField):
+                casts[field_name] = ModelCast(model_class=typ)
+                continue
+
             field_info = (
                 descriptor.field_info
                 if isinstance(descriptor, FieldDescriptor)
@@ -204,12 +271,29 @@ class Caster:
             or t is Carbon
         ):
             return "date"
+        if t is datetime.time:
+            return "time"
+        if t is datetime.timedelta:
+            return "timedelta"
         if isinstance(t, type):
             if issubclass(t, Enum) or hasattr(t, "get") or hasattr(t, "set"):
                 return t
 
         return "str"
 
+    @staticmethod
+    def _apply_default(cast: "BaseCast"):
+        """Return the Field default/default_factory value, or None if none is set."""
+        from pydantic_core import PydanticUndefined
+
+        if cast.config is None:
+            return None
+        if cast.config.default is not PydanticUndefined:
+            return cast.config.default
+        if cast.config.default_factory is not None:
+            return cast.config.default_factory()
+        return None
+
     def get(self, attribute: str, value: Any) -> Any:
         if attribute not in self.casts:
             return value
@@ -220,7 +304,10 @@ class Caster:
             return str(value) if value is not None else None
 
         if isinstance(cast, BaseCast):
-            return cast.get(value)
+            result = cast.get(value)
+            if result is None:
+                result = self._apply_default(cast)
+            return result
 
         if isinstance(cast, type):
             if issubclass(cast, Enum):

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.0}/src/fastapi_startkit/masoniteorm/models/fields.py

@@ -41,6 +41,19 @@ def Field(*args, **kwargs) -> Any:
     return FieldDescriptor(BaseField(*args, **kwargs))
 
 
+class ModelField:
+    def __set_name__(self, owner, name):
+        self.name = name
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        return instance.get_attribute(self.name)
+
+    def __set__(self, instance, value):
+        instance.set_attribute(self.name, value)
+
+
 class DateTimeField:
     def __init__(self, fmt: str = "YYYY-MM-DD HH:mm:ss", tz: str = "UTC"):
         self.format = fmt

{fastapi_startkit-0.24.0 → fastapi_startkit-0.26.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.24.0 → fastapi_startkit-0.26.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.24.0 → fastapi_startkit-0.26.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.24.0 → fastapi_startkit-0.26.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.24.0 → fastapi_startkit-0.26.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

fastapi_startkit-0.26.0/src/fastapi_startkit/storage/__init__.py

@@ -0,0 +1,6 @@
+from .storage import Storage
+from .config import S3Config, LocalDiskConfig, PublicDiskConfig
+from .drivers.fake import FakeDriver
+from .providers.provider import StorageProvider
+
+__all__ = ["Storage", "S3Config", "LocalDiskConfig", "PublicDiskConfig", "FakeDriver", "StorageProvider"]

fastapi_startkit-0.24.0/src/fastapi_startkit/masoniteorm/__init__.py

@@ -1,8 +0,0 @@
-from .config.config import MySQLConfig, PostgresConfig, SQLiteConfig
-from .facades import DB
-from .migrations.Migration import Migration
-from .migrations.Migrator import Migrator
-from .models import Model
-from .providers import DatabaseProvider
-
-__all__ = ["DatabaseProvider", "PostgresConfig", "MySQLConfig", "SQLiteConfig", "Model", "DB", "Migration", "Migrator"]

fastapi_startkit-0.24.0/src/fastapi_startkit/storage/__init__.py

@@ -1,3 +0,0 @@
-from .storage import Storage
-from .config import S3Config, LocalDiskConfig, PublicDiskConfig
-from .drivers.fake import FakeDriver