tina4-python 0.2.126__tar.gz → 0.2.128__tar.gz

{tina4_python-0.2.126 → tina4_python-0.2.128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.126
+Version: 0.2.128
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.126 → tina4_python-0.2.128}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.126"
+version = "0.2.128"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.126 → tina4_python-0.2.128}/tina4_python/CRUD.py

@@ -1,3 +1,7 @@
+import base64
+import datetime
+from decimal import Decimal
+
 from tina4_python.Debug import Debug
 import re
 from tina4_python.Template import Template
@@ -6,6 +10,7 @@ from tina4_python.Router import Router
 import tina4_python
 import os
 import shutil
+import json
 
 class CRUD:
 
@@ -17,8 +22,7 @@ class CRUD:
         self.search_columns = []
         self.total_count = 0
         self.sql = None
-
-    import re
+        self.error = ""
 
     def strip_sql_pagination(self, sql: str) -> str:
         """
@@ -139,7 +143,6 @@ class CRUD:
     def to_crud(self, request, options=None):
         table_name = self.get_table_name(self.sql)
         table_nice_name = Template.get_nice_label(table_name)
-        twig_file = self.ensure_crud_template(table_name + ".twig")
 
         if options is None:
             options = {}
@@ -159,6 +162,13 @@ class CRUD:
         if "search_columns" in options:
             self.search_columns = options["search_columns"]
 
+        crud_name = table_name
+        if "name" in options:
+            crud_name = options["name"]
+
+        twig_file = self.ensure_crud_template(crud_name + ".twig")
+
+
         async def get_record(request, response):
             limit = int(request.params.get("limit", options.get("limit", 10)))
             offset = int(request.params.get("offset", options.get("offset", 0)))
@@ -209,21 +219,72 @@ class CRUD:
             self.dba.commit()
             return response({"message": f"<script>showMessage('{table_nice_name}  Record deleted');</script>"}, HTTP_OK, APPLICATION_JSON)
 
-        Router.add(TINA4_GET, os.path.join(request.url, table_name).replace("\\", "/"), get_record)
-        Router.add(TINA4_POST, os.path.join(request.url, table_name).replace("\\", "/"), post_record)
-        Router.add(TINA4_POST, os.path.join(request.url, table_name, "{"+options["primary_key"]+"}").replace("\\", "/"), update_record)
-        Router.add(TINA4_DELETE, os.path.join(request.url, table_name, "{"+options["primary_key"]+"}").replace("\\", "/"), delete_record)
+        Router.add(TINA4_GET, os.path.join(request.url, crud_name).replace("\\", "/"), get_record)
+        Router.add(TINA4_POST, os.path.join(request.url, crud_name).replace("\\", "/"), post_record)
+        Router.add(TINA4_POST, os.path.join(request.url, crud_name, "{"+options["primary_key"]+"}").replace("\\", "/"), update_record)
+        Router.add(TINA4_DELETE, os.path.join(request.url, crud_name, "{"+options["primary_key"]+"}").replace("\\", "/"), delete_record)
 
         fields = []
         for column in self.columns:
             fields.append({"name": column, "label": Template.get_nice_label(column)})
 
+
         html = Template.render(twig_file.replace(os.path.join(tina4_python.root_path, "src", "templates"), "").replace("\\", "/"),
-                               {"columns": fields, "records": self.records,
-                                "table_name": table_name,
+                               {"columns": fields, "records": self.to_array(),
+                                "table_name": crud_name,
                                 "total_records": self.total_count,
                                 "options": options})
 
         return html
 
 
+    def to_array(self, _filter=None):
+        """
+        Creates an array or list of the items
+        :return:
+        """
+        if self.error is not None:
+            return {"error": self.error}
+        elif len(self.records) > 0:
+            # check all the records - if we get bytes we base64encode them for the json to work
+            json_records = []
+            for record in self.records:
+                json_record = {}
+                for key in record:
+                    if isinstance(record[key], Decimal):
+                        json_record[key] = float(record[key])
+                    elif isinstance(record[key], (datetime.date, datetime.datetime)):
+                        json_record[key] = record[key].isoformat()
+                    elif isinstance(record[key], memoryview):
+                        json_record[key] = base64.b64encode(record[key].tobytes()).decode('utf-8')
+                    elif isinstance(record[key], bytes):
+                        json_record[key] = base64.b64encode(record[key]).decode('utf-8')
+                    else:
+                        json_record[key] = record[key]
+
+                if _filter is not None:
+                    json_record = _filter(json_record)
+
+                json_records.append(json_record)
+
+            return json_records
+        else:
+            return []
+
+    def to_list(self, _filter=None):
+        return self.to_array(_filter)
+
+    def to_json(self, _filter=None):
+        return json.dumps(self.to_array(_filter))
+
+    def __iter__(self):
+        return iter(self.to_array())
+
+    def __getitem__(self, item):
+        if item < len(self.records):
+            return self.records[item]
+        else:
+            return {}
+
+    def __str__(self):
+        return self.to_json()

{tina4_python-0.2.126 → tina4_python-0.2.128}/tina4_python/Database.py

@@ -10,6 +10,8 @@ import sys
 import importlib
 import datetime
 import json
+from decimal import Decimal
+
 from tina4_python import Debug, Constant
 from tina4_python.Constant import TINA4_LOG_ERROR
 from tina4_python.DatabaseResult import DatabaseResult
@@ -351,6 +353,8 @@ class Database:
         if record.error is None and record.count == 1:
             data = {}
             for key in record.records[0]:
+                if isinstance(record.records[0][key], Decimal):
+                    data[key] = float(record.records[0][key])
                 if isinstance(record.records[0][key], (datetime.date, datetime.datetime)):
                     data[key] = record.records[0][key].isoformat()
                 if isinstance(record.records[0][key], bytes):

tina4_python-0.2.128/tina4_python/DatabaseResult.py

@@ -0,0 +1,67 @@
+#
+# Tina4 - This is not a 4ramework.
+# Copy-right 2007 - current Tina4
+# License: MIT https://opensource.org/licenses/MIT
+#
+# flake8: noqa: E501
+import base64
+import json
+import datetime
+from decimal import Decimal
+from tina4_python.CRUD import CRUD
+class DatabaseResult(CRUD):
+    def __init__(self, _records=None, _columns=None, _error=None, count=None, limit=None, skip=None, sql=None, dba=None):
+        """
+        DatabaseResult constructor
+        :param _records:
+        :param _columns:
+        :param _error:
+        :param count:
+        :param limit:
+        :param skip:
+        """
+        super().__init__()
+        if count is not None:
+            self.total_count = count
+        else:
+            self.total_count = 0
+
+        if limit is not None:
+            self.limit = limit
+        else:
+            self.limit = 0
+
+        if skip is not None:
+            self.skip = skip
+        else:
+            self.skip = 0
+
+        if _records is not None:
+            self.records = _records
+        else:
+            self.records = []
+
+        self.count = len(self.records)
+
+        if _columns is not None:
+            self.columns = _columns
+        else:
+            self.columns = []
+
+        if sql is not None:
+            self.sql = sql
+
+        if dba is not None:
+            self.dba = dba
+
+        self.error = _error
+
+    def to_paginate(self):
+
+        return {"recordsTotal": self.total_count, "recordsOffset": self.skip, "recordCount": self.count,
+                "recordsFiltered": self.total_count, "fields": self.columns, "data": self.to_array(),
+                "dataError": self.error}
+
+
+
+

tina4_python-0.2.126/tina4_python/DatabaseResult.py

@@ -1,116 +0,0 @@
-#
-# Tina4 - This is not a 4ramework.
-# Copy-right 2007 - current Tina4
-# License: MIT https://opensource.org/licenses/MIT
-#
-# flake8: noqa: E501
-import base64
-import json
-import datetime
-from decimal import Decimal
-from tina4_python.CRUD import CRUD
-class DatabaseResult(CRUD):
-    def __init__(self, _records=None, _columns=None, _error=None, count=None, limit=None, skip=None, sql=None, dba=None):
-        """
-        DatabaseResult constructor
-        :param _records:
-        :param _columns:
-        :param _error:
-        :param count:
-        :param limit:
-        :param skip:
-        """
-        super().__init__()
-        if count is not None:
-            self.total_count = count
-        else:
-            self.total_count = 0
-
-        if limit is not None:
-            self.limit = limit
-        else:
-            self.limit = 0
-
-        if skip is not None:
-            self.skip = skip
-        else:
-            self.skip = 0
-
-        if _records is not None:
-            self.records = _records
-        else:
-            self.records = []
-
-        self.count = len(self.records)
-
-        if _columns is not None:
-            self.columns = _columns
-        else:
-            self.columns = []
-
-        if sql is not None:
-            self.sql = sql
-
-        if dba is not None:
-            self.dba = dba
-
-        self.error = _error
-
-    def to_paginate(self):
-
-        return {"recordsTotal": self.total_count, "recordsOffset": self.skip, "recordCount": self.count,
-                "recordsFiltered": self.total_count, "fields": self.columns, "data": self.to_array(),
-                "dataError": self.error}
-
-    def to_array(self, _filter=None):
-        """
-        Creates an array or list of the items
-        :return:
-        """
-        if self.error is not None:
-            return {"error": self.error}
-        elif len(self.records) > 0:
-            # check all the records - if we get bytes we base64encode them for the json to work
-            json_records = []
-            for record in self.records:
-                json_record = {}
-                for key in record:
-                    if isinstance(record[key], Decimal):
-                        json_record[key] = float(record[key])
-                    elif isinstance(record[key], (datetime.date, datetime.datetime)):
-                        json_record[key] = record[key].isoformat()
-                    elif isinstance(record[key], memoryview):
-                        json_record[key] = base64.b64encode(record[key].tobytes()).decode('utf-8')
-                    elif isinstance(record[key], bytes):
-                        json_record[key] = base64.b64encode(record[key]).decode('utf-8')
-                    else:
-                        json_record[key] = record[key]
-
-                if _filter is not None:
-                    json_record = _filter(json_record)
-
-                json_records.append(json_record)
-
-            return json_records
-        else:
-            return []
-
-    def to_list(self, _filter=None):
-        return self.to_array(_filter)
-
-    def to_json(self, _filter=None):
-        return json.dumps(self.to_array(_filter))
-
-    def __iter__(self):
-        return iter(self.to_array())
-
-    def __getitem__(self, item):
-        if item < len(self.records):
-            return self.records[item]
-        else:
-            return {}
-
-    def __str__(self):
-        return self.to_json()
-
-