Simplify Optional class

freenit/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.5"
+__version__ = "0.3.6"

freenit/models/sql/base.py

@@ -40,11 +40,6 @@ class OrmarRoleMixin:
 )
 
 
-def generate_optional(Model):
-    class OptionalModel(Model):
-        pass
-
+def make_optional(OptionalModel):
     for field_name in OptionalModel.model_fields:
         OptionalModel.model_fields[field_name].default = None
-
-    return OptionalModel

freenit/models/sql/role.py

@@ -1,8 +1,12 @@
-from .base import OrmarBaseModel, OrmarRoleMixin, generate_optional, ormar_config
+from .base import OrmarBaseModel, OrmarRoleMixin, make_optional, ormar_config
 
 
 class Role(OrmarBaseModel, OrmarRoleMixin):
     ormar_config = ormar_config.copy()
 
 
-RoleOptional = generate_optional(Role)
+class RoleOptional:
+    pass
+
+
+make_optional(RoleOptional)

freenit/models/sql/theme.py

@@ -1,6 +1,6 @@
 import ormar
 
-from .base import OrmarBaseModel, ormar_config, generate_optional
+from .base import OrmarBaseModel, make_optional, ormar_config
 
 
 class Theme(OrmarBaseModel):
@@ -24,4 +24,8 @@ class Theme(OrmarBaseModel):
     font_family_mono: str = ormar.Text()
 
 
-ThemeOptional = generate_optional(Theme)
+class ThemeOptional:
+    pass
+
+
+make_optional(ThemeOptional)

freenit/models/sql/user.py

@@ -8,7 +8,7 @@
 from freenit.models.sql.base import (
     OrmarBaseModel,
     OrmarUserMixin,
-    generate_optional,
+    make_optional,
     ormar_config,
 )
 from freenit.models.role import Role
@@ -35,5 +35,9 @@ class User(BaseUser, OrmarUserMixin):
     roles = ormar.ManyToMany(Role, unique=True)
 
 
-UserOptional = generate_optional(User)
+class UserOptional:
+    pass
+
+
+make_optional(UserOptional)
 UserOptionalPydantic = User.get_pydantic(exclude={"admin", "active"})

freenit/project/bin/build.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+BIN_DIR=`dirname $0`
+PROJECT_DIR="${BIN_DIR}"
+export FREENIT_ENV="build"
+. ${BIN_DIR}/common.sh
+
+
+setup
+pip install hatchling
+
+
+rm -rf *.egg-info build dist
+find . -name '*.pyc' -exec rm -rf {} \;
+hatchling build

freenit/project/pyproject.toml

@@ -10,6 +10,7 @@ readme = "README.md"
 license = {file = "LICENSE"}
 requires-python = ">=3.8"
 dependencies = [
+  "aiosqlite",
   "freenit[ormar]",
 ]
 authors = [

pyproject.toml

@@ -12,6 +12,7 @@ requires-python = ">=3.8"
 dependencies = [
   "fastapi",
   "passlib",
+  "prompt-toolkit",
   "pydantic[email]",
   "pyjwt",
 ]