sera-2 1.1.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

sera/libs/base_orm.py

@@ -6,15 +6,14 @@ import orjson
 from sqlalchemy import LargeBinary, TypeDecorator
 from sqlalchemy import create_engine as sqlalchemy_create_engine
 from sqlalchemy import update
-from sqlalchemy.orm import DeclarativeBase, Session
 
 
-class BaseORM(DeclarativeBase):
+class BaseORM:
 
     def get_update_query(self):
         q = update(self.__class__)
         args = {}
-        for col in self.__table__.columns:
+        for col in self.__table__.columns:  # type: ignore
             val = getattr(self, col.name)
             if col.primary_key:
                 q = q.where(getattr(self.__class__, col.name) == val)
@@ -23,7 +22,7 @@ class BaseORM(DeclarativeBase):
         return q.values(**args)
 
     def get_update_args(self):
-        return {col.name: getattr(self, col.name) for col in self.__table__.columns}
+        return {col.name: getattr(self, col.name) for col in self.__table__.columns}  # type: ignore
 
     @classmethod
     def from_dict(cls, data: dict):

sera/libs/base_service.py

@@ -29,13 +29,13 @@ Query = Annotated[
     dict[FieldName, dict[QueryOp, Annotated[Any, doc("query value")]]],
     doc("query operations"),
 ]
-C = TypeVar("C", bound=BaseORM)
-ID = Annotated[TypeVar("ID"), doc("ID of a class")]
+R = TypeVar("R", bound=BaseORM)
+ID = TypeVar("ID")  # ID of a class
 
 
-class BaseService(Generic[ID, C]):
+class BaseService(Generic[ID, R]):
 
-    def __init__(self, cls: Class, orm_cls: type[C]):
+    def __init__(self, cls: Class, orm_cls: type[R]):
         self.cls = cls
         self.orm_cls = orm_cls
         self.id_prop = assert_not_null(cls.get_id_property())
@@ -51,7 +51,8 @@ class BaseService(Generic[ID, C]):
         sorted_by: list[str],
         group_by: list[str],
         fields: list[str],
-    ) -> Sequence[C]:
+        session: Session,
+    ) -> Sequence[R]:
         """Retrieving records matched a query.
 
         Args:
@@ -65,7 +66,7 @@ class BaseService(Generic[ID, C]):
         """
         return []
 
-    def get_by_id(self, id: ID, session: Session) -> Optional[C]:
+    def get_by_id(self, id: ID, session: Session) -> Optional[R]:
         """Retrieving a record by ID."""
         q = select(self.orm_cls).where(self._cls_id_prop == id)
         result = session.execute(q).scalar_one_or_none()
@@ -76,3 +77,15 @@ class BaseService(Generic[ID, C]):
         q = exists().where(self._cls_id_prop == id)
         result = session.query(q).scalar()
         return bool(result)
+
+    def create(self, record: R, session: Session) -> R:
+        """Create a new record."""
+        session.add(record)
+        session.commit()
+        return record
+
+    def update(self, record: R, session: Session) -> R:
+        """Update an existing record."""
+        session.add(record)
+        session.commit()
+        return record

sera/make/make_app.py

@@ -13,7 +13,7 @@ from sera.make.make_python_model import (
     make_python_relational_model,
 )
 from sera.make.make_python_services import make_python_service_structure
-from sera.models import App, DataCollection, parse_schema
+from sera.models import App, DataCollection, Language, parse_schema
 
 
 def make_config(app: App):
@@ -37,7 +37,7 @@ def make_config(app: App):
         )(
             lambda ast01: ast01.assign(
                 DeferredVar.simple("CFG_FILE"),
-                expr.ExprRawPython("Path(__file__).parent.parent / 'config.yaml'"),
+                expr.ExprRawPython("Path(__file__).parent.parent / 'config.yml'"),
             ),
         ),
         lambda ast: ast.else_()(
@@ -107,10 +107,16 @@ def make_app(
         list[str],
         doc("API collections to generate."),
     ],
+    language: Annotated[
+        Language,
+        doc(
+            "Language of the generated application. Currently only Python is supported."
+        ),
+    ] = Language.Python,
 ):
     schema = parse_schema(schema_files)
 
-    app = App(app_dir.name, app_dir, schema_files)
+    app = App(app_dir.name, app_dir, schema_files, language)
 
     # generate application configuration
     make_config(app)