tina4-python 0.2.35__tar.gz → 0.2.36__tar.gz

{tina4_python-0.2.35 → tina4_python-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tina4-python
-Version: 0.2.35
+Version: 0.2.36
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com

{tina4_python-0.2.35 → tina4_python-0.2.36}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.2.35"
+version = "0.2.36"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"

{tina4_python-0.2.35 → tina4_python-0.2.36}/tina4_python/Database.py

@@ -8,6 +8,7 @@ import base64
 import importlib
 import datetime
 import json
+from decimal import Decimal
 
 from tina4_python import Debug, Constant
 from tina4_python.DatabaseResult import DatabaseResult

{tina4_python-0.2.35 → tina4_python-0.2.36}/tina4_python/DatabaseResult.py

@@ -7,6 +7,7 @@
 import base64
 import json
 import datetime
+from decimal import Decimal
 
 
 class DatabaseResult:
@@ -34,7 +35,9 @@ class DatabaseResult:
             for record in self.records:
                 json_record = {}
                 for key in record:
-                    if isinstance(record[key], datetime.datetime):
+                    if isinstance(record[key], Decimal):
+                        json_record[key] = str(record[key])
+                    elif isinstance(record[key], datetime.datetime):
                         json_record[key] = record[key].isoformat()
                     elif isinstance(record[key], bytes):
                         json_record[key] = base64.b64encode(record[key]).decode('utf-8')
@@ -47,10 +50,14 @@ class DatabaseResult:
         else:
             return []
 
+    def to_list(self):
+        return self.to_array()
+
     def to_json(self):
         return json.dumps(self.to_array())
 
     def __getitem__(self, item):
+        print('ITEM', item)
         if item < len(self.records):
             return self.records[item]
         else:
@@ -58,3 +65,4 @@ class DatabaseResult:
 
     def __str__(self):
         return self.to_json()
+

tina4_python-0.2.36/tina4_python/ORM.py

@@ -0,0 +1,131 @@
+import base64
+from datetime import datetime, date
+import inspect
+import ast
+import json
+import os
+import tina4_python
+from tina4_python.Debug import Debug
+
+
+def orm(dba):
+    Debug("Initializing ORM")
+    orm_path = tina4_python.root_path+os.sep+"src"+os.sep+"orm"
+    # load and assign
+
+    for file in os.listdir(orm_path):
+        mod_name = file.removesuffix(".py")
+        if "__init__" not in mod_name and "__pycache__" not in mod_name:
+            # import and set the database object
+            Debug('from src.orm.'+mod_name+' import ' + mod_name)
+            exec('from src.orm.'+mod_name+' import ' + mod_name)
+            exec(mod_name+".__dba__ = dba")
+
+
+class BaseField:
+    primary_key = False
+    column_type = None
+    default_value = None
+    column_name = None
+    auto_increment = False
+
+    def __init__(self, column_name=None, primary_key=False, default_value=None, auto_increment=False):
+        self.primary_key = primary_key
+        self.column_type = None
+        self.default_value = default_value
+        self.auto_increment = auto_increment
+
+        if column_name  is None:
+            frame = inspect.stack()[1]
+            # Parse python syntax of the assignment line
+            st = ast.parse(frame.code_context[0].strip())
+            stmt = st.body[0]
+            # Assume class being instanced as simple assign statement
+            assert(isinstance(stmt, ast.Assign))
+            # Parse the target the class is assigned to
+            target = stmt.targets[0]
+            self.column_name = target.id
+        else:
+            self.column_name = column_name
+
+class DateTimeField(BaseField):
+    column_type = datetime
+
+class IntegerField(BaseField):
+    column_type = int
+
+class NumericField(BaseField):
+    column_type = float
+
+class StringField(BaseField):
+    column_type = str
+
+class TextField(BaseField):
+    column_type = str
+
+class BlobField(BaseField):
+    column_type = bytes
+
+class ForeignKeyField:
+    field_type = None
+    references_table = None
+    references_column = None
+
+    def __init__(self, field_type=BaseField, references_table=None):
+        self.field_type = field_type
+        self.references_table = references_table
+        self.references_column = field_type.column_name
+
+def json_serialize(obj):
+    """JSON serializer for objects not serializable by default json code"""
+
+    if isinstance(obj, (datetime, date)):
+        return obj.isoformat()
+    elif isinstance(obj, bytes):
+        return base64.b64encode(obj).decode('utf-8')
+    raise TypeError ("Type %s not serializable" % type(obj))
+
+
+class ORM:
+    __table_name__ = None
+    __primary_key__ = "id"
+    __dba__ = None
+
+    def __init__(self, init_object=None, table_name=None):
+        class_name = self.__class__.__name__
+        if self.__table_name__ is None:
+            if table_name is None:
+                self.__table_name__ = class_name.lower()
+            else:
+                self.__table_name__ = table_name.lower()
+        if init_object is not None:
+            self.populate_orm(init_object)
+        print(self.__dba__, self.__table_name__, self.__primary_key__)
+
+    def populate_orm(self, init_object):
+        print("Populating ORM", init_object)
+        pass
+
+    def to_json(self):
+        return json.dumps(self.__dict__, default=json_serialize)
+
+    def to_dict(self):
+        return self.__dict__
+
+    def __str__(self):
+        return self.to_json()
+
+    def load(self, query="", params=[]):
+
+        pass
+
+    def save(self):
+        # check if record exists
+
+        # save or update record
+
+        return False
+
+    def delete(self):
+
+        pass

{tina4_python-0.2.35 → tina4_python-0.2.36}/tina4_python/__init__.py

@@ -115,25 +115,38 @@ if not os.path.exists(root_path + os.sep + "src" + os.sep + "public"):
 # ignore F403
 if os.path.exists(root_path + os.sep + "src"):
     try:
-        from src import *
-    except ImportError:
-        Debug("Cannot import src folder", Constant.TINA4_LOG_ERROR)
+        src_path = root_path + os.sep + "src"
+        for file in os.listdir(src_path):
+            if file.endswith(".py"):
+                file_name = file.removesuffix(".py")
+                exec("from src import "+ file_name)
+
+    except ImportError as e:
+        Debug("Cannot import src folder", str(e), Constant.TINA4_LOG_ERROR)
 else:
     Debug("Missing src folder", Constant.TINA4_LOG_WARNING)
 
 if os.path.exists(root_path + os.sep + "src" + os.sep + "routes"):
     try:
-        from src.routes import *
-    except ImportError:
-        Debug("Cannot import src.routes folder", Constant.TINA4_LOG_ERROR)
+        src_path = root_path + os.sep + "src"+ os.sep + "routes"
+        for file in os.listdir(src_path):
+            if file.endswith(".py"):
+                file_name = file.removesuffix(".py")
+                exec("from src.routes import "+ file_name)
+    except ImportError as e:
+        Debug("Cannot import src.routes folder", str(e), Constant.TINA4_LOG_ERROR)
 else:
     Debug("Missing src/routes folder", Constant.TINA4_LOG_WARNING)
 
 if os.path.exists(root_path + os.sep + "src" + os.sep + "app"):
     try:
-        from src.app import *
-    except ImportError:
-        Debug("Cannot import src.app folder", Constant.TINA4_LOG_ERROR)
+        src_path = root_path + os.sep + "src"+ os.sep + "app"
+        for file in os.listdir(src_path):
+            if file.endswith(".py"):
+                file_name = file.removesuffix(".py")
+                exec("from src.app import "+ file_name)
+    except ImportError as e:
+        Debug("Cannot import src.app folder", str(e), Constant.TINA4_LOG_ERROR)
 else:
     Debug("Missing src/app folder", Constant.TINA4_LOG_WARNING)