tina4-python 0.2.168__tar.gz → 0.2.170__tar.gz

{tina4_python-0.2.168 → tina4_python-0.2.170}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.168
+Version: 0.2.170
 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.168 → tina4_python-0.2.170}/pyproject.toml

@@ -1,65 +1,65 @@
-[project]
-name = "tina4-python"
-version = "0.2.168"
-description = "Tina4Python - This is not another framework for Python"
-authors = [
-    {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}
-]
-readme = "README.md"
-requires-python = ">=3.12,<4.0"
-dependencies = [
-    "jinja2>=3.1.5,<4.0.0",
-    "libsass (>=0.23.0,<0.24.0)",
-    "python-dotenv (>=1.0.1,<2.0.0)",
-    "pyjwt (>=2.10.1,<3.0.0)",
-    "cryptography (>=44.0.0,<45.0.0)",
-    "watchdog (>=6.0.0,<7.0.0)",
-    "bcrypt (>=4.2.1,<5.0.0)",
-    "litequeue (>=0.9,<0.10)",
-    "simple-websocket (>=1.1.0,<2.0.0)",
-    "asyncer>=0.0.8",
-    "hypercorn>=0.18.0",
-    "requests>=2.32.5",
-]
-
-[dependency-groups]
-dev = [
-    "flake8>=7.2.0",
-    "jurigged>=0.6.0",
-    "mkdocs>=1.6.1",
-    "mysql-connector-python>=9.3.0",
-    "psycopg2-binary>=2.9.10",
-    "pydoc-markdown>=4.8.2",
-    "pytest>=8.3.5",
-    "pytest-asyncio>=1.3.0",
-    "python-keycloak>=5.8.1",
-    "ruff>=0.11.9",
-    "safety>=3.5.0",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build]
-include = [
-    "tina4_python/**/*"
-]
-
-[project.scripts]
-tina4 = "tina4_python.cli:main"
-
-[[tool.pydoc-markdown.loaders]]
-type = "python"
-search_path = [ "./tina4_python" ]
-
-[tool.pydoc-markdown.renderer]
-type = "mkdocs"
-site_name= "Tina4Python"
-
-[[tool.pydoc-markdown.renderer.pages]]
-title = "API Documentation"
-name = "index"
-
-contents = [ "*" ]
-
+[project]
+name = "tina4-python"
+version = "0.2.170"
+description = "Tina4Python - This is not another framework for Python"
+authors = [
+    {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}
+]
+readme = "README.md"
+requires-python = ">=3.12,<4.0"
+dependencies = [
+    "jinja2>=3.1.5,<4.0.0",
+    "libsass (>=0.23.0,<0.24.0)",
+    "python-dotenv (>=1.0.1,<2.0.0)",
+    "pyjwt (>=2.10.1,<3.0.0)",
+    "cryptography (>=44.0.0,<45.0.0)",
+    "watchdog (>=6.0.0,<7.0.0)",
+    "bcrypt (>=4.2.1,<5.0.0)",
+    "litequeue (>=0.9,<0.10)",
+    "simple-websocket (>=1.1.0,<2.0.0)",
+    "asyncer>=0.0.8",
+    "hypercorn>=0.18.0",
+    "requests>=2.32.5",
+]
+
+[dependency-groups]
+dev = [
+    "flake8>=7.2.0",
+    "jurigged>=0.6.0",
+    "mkdocs>=1.6.1",
+    "mysql-connector-python>=9.3.0",
+    "psycopg2-binary>=2.9.10",
+    "pydoc-markdown>=4.8.2",
+    "pytest>=8.3.5",
+    "pytest-asyncio>=1.3.0",
+    "python-keycloak>=5.8.1",
+    "ruff>=0.11.9",
+    "safety>=3.5.0",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build]
+include = [
+    "tina4_python/**/*"
+]
+
+[project.scripts]
+tina4 = "tina4_python.cli:main"
+
+[[tool.pydoc-markdown.loaders]]
+type = "python"
+search_path = [ "./tina4_python" ]
+
+[tool.pydoc-markdown.renderer]
+type = "mkdocs"
+site_name= "Tina4Python"
+
+[[tool.pydoc-markdown.renderer.pages]]
+title = "API Documentation"
+name = "index"
+
+contents = [ "*" ]
+

{tina4_python-0.2.168 → tina4_python-0.2.170}/tina4_python/CRUD.py

@@ -8,6 +8,7 @@
 import base64
 import datetime
 from decimal import Decimal
+from shlex import join
 
 from tina4_python.Debug import Debug
 import re
@@ -252,6 +253,21 @@ class CRUD:
 
             twig_file = self.ensure_crud_template(crud_name + ".twig")
 
+            def parse_request_for_images(request):
+                """
+                Parses request for images and files
+                :param request:
+                :return:
+                """
+                # if there are files in the request the  then I assign the file value to the request body
+                if request.files:
+                    for input_name in request.files:
+                        prefix = ""
+                        if "image" in request.files[input_name]["content_type"]:
+                            prefix ="data:"+request.files[input_name]["content_type"]+";base64,"
+                        request.body[input_name] = prefix+request.files[input_name]["content"]
+                return request
+
             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)))
@@ -285,12 +301,21 @@ class CRUD:
 
             async def post_record(request, response):
                 Debug.info("CRUD CREATE", table_name, request.body)
+
+                request = parse_request_for_images(request)
+
                 self.dba.insert(table_name, request.body, primary_key=options["primary_key"])
                 self.dba.commit()
                 return response({"message": f"<script>showMessage('{table_nice_name} Record added');</script>"}, HTTP_OK, APPLICATION_JSON)
 
             async def update_record(request, response):
                 Debug.info("CRUD UPDATE", table_name, request.params, request.body)
+                # Add the primary key if it is taken out of the form
+                if options["primary_key"] not in request.body:
+                    request.body[options["primary_key"]] = request.params[options["primary_key"]]
+
+                request = parse_request_for_images(request)
+
                 self.dba.update(table_name, request.body, primary_key=options["primary_key"])
                 self.dba.commit()
                 return response({"message": f"<script>showMessage('{table_nice_name} Record updated');</script>", "post": request.body}, HTTP_OK, APPLICATION_JSON)
@@ -311,7 +336,7 @@ class CRUD:
                 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.to_array(),
+                                   {"columns": fields, "records": self.to_array(base64_encode=False),
                                     "table_name": crud_name,
                                     "total_records": self.total_count,
                                     "options": options})
@@ -320,7 +345,7 @@ class CRUD:
         except Exception as e:
             return "Error rendering CRUD: "+str(e)
 
-    def to_array(self, _filter=None):
+    def to_array(self, _filter=None, base64_encode = True):
         """
         Convert the internal records to a JSON-serializable list of dictionaries.
 
@@ -334,6 +359,8 @@ class CRUD:
 
         Returns:
             list[dict]: Serializable records.
+            :param _filter:
+            :param base64_encode: Override default base64 encoding
         """
         if self.error is not None:
             return {"error": self.error}
@@ -348,9 +375,15 @@ class CRUD:
                     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')
+                        if base64_encode:
+                            json_record[key] = base64.b64encode(record[key].tobytes()).decode('utf-8')
+                        else:
+                            json_record[key] = record[key].tobytes().decode("utf-8")
+                    elif isinstance(record[key], bytes) and base64_encode:
+                        if base64_encode:
+                            json_record[key] = base64.b64encode(record[key]).decode('utf-8')
+                        else:
+                            json_record[key] = record[key].decode("utf-8")
                     else:
                         json_record[key] = record[key]
 
@@ -363,13 +396,13 @@ class CRUD:
         else:
             return []
 
-    def to_list(self, _filter=None):
+    def to_list(self, _filter=None, base64_encode = True):
         """Alias of to_array() for readability."""
-        return self.to_array(_filter)
+        return self.to_array(_filter, base64_encode=base64_encode)
 
-    def to_json(self, _filter=None):
+    def to_json(self, _filter=None, base64_encode = True):
         """Return records as a JSON encoded string."""
-        return json.dumps(self.to_array(_filter))
+        return json.dumps(self.to_array(_filter, base64_encode=base64_encode))
 
     def __iter__(self):
         """Allow iteration over records (yields results from to_array())."""

{tina4_python-0.2.168 → tina4_python-0.2.170}/tina4_python/FieldTypes.py

@@ -9,6 +9,7 @@ import ast
 import inspect
 from datetime import datetime
 from tina4_python.DatabaseTypes import MSSQL, POSTGRES, FIREBIRD
+from tina4_python import Debug
 
 class BaseField:
     primary_key = False
@@ -83,15 +84,21 @@ class BaseField:
             self.decimal_places = decimal_places
 
         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
+            try:
+                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]
+                if hasattr(target, 'id'):
+                    self.column_name = target.id
+                else:
+                    raise Exception("Sorry we can't determine the column name for ORM ")
+            except Exception as e:
+                Debug.error("Error determining field column for ORM Object", str(e))
         else:
             self.column_name = column_name
 

{tina4_python-0.2.168 → tina4_python-0.2.170}/tina4_python/ORM.py

@@ -5,12 +5,10 @@
 #
 # flake8: noqa: E501
 import base64
-from datetime import datetime, date
-import ast
+from datetime import date
 import json
 import os
 from tina4_python.Constant import TINA4_LOG_ERROR
-from tina4_python.Debug import Debug
 from tina4_python.FieldTypes import *
 
 
@@ -186,7 +184,10 @@ class ORM:
 
                 data[key] = current_value.value
             elif isinstance(value, IntegerField):
-                data[key] = int(current_value)
+                try:
+                    data[key] = int(current_value)
+                except Exception as e:
+                    Debug.error("Could not save", current_value, "to", key)
             else:
                 data[key] = str(current_value)
 

{tina4_python-0.2.168 → tina4_python-0.2.170}/tina4_python/__init__.py

@@ -217,7 +217,7 @@ from .Router import get, post, put, patch, delete, middleware, cached, noauth, s
 from .Testing import tests, assert_equal, assert_raises
 from .Debug import Debug
 from .Database import Database
-from .ORM import ORM
+from .ORM import ORM, orm
 from .Api import Api
 from .Template import template
 from .Swagger import description, secure, summary, example, example_response, tags, params, describe
@@ -231,10 +231,14 @@ for deco in (get, post, put, patch, delete, middleware, cached, noauth, secured,
     if deco.__name__ not in builtins.__dict__:
         builtins.__dict__[deco.__name__] = deco
 
+
+
 builtins.Debug = Debug
 builtins.Api = Api
 builtins.Database = Database
 builtins.ORM = ORM
+builtins.orm = orm
+
 
 # Auto-import everything from src folders
 if os.path.exists(root_path + os.sep + "src"):

{tina4_python-0.2.168 → tina4_python-0.2.170}/tina4_python/templates/components/crud.twig

@@ -59,7 +59,7 @@
                                         {# --- Only show image if it's base64-like and long enough --- #}
                                         {% if is_image and value|length > 50 and value is string %}
                                             {% set src = value %}
-                                            {% if value[:10] != 'data:image/' %}
+                                            {% if value[:11] != 'data:image/' %}
                                                 {% set src = 'data:image/' ~ mime_type ~ ';base64,' ~ value %}
                                             {% endif %}
 
@@ -131,7 +131,7 @@
                                 {# --- Only show image if it's base64-like and long enough --- #}
                                 {% if is_image  %}
                                     {% set src = value %}
-                                    {% if value[:10] != 'data:image/' %}
+                                    {% if value[:11] != 'data:image/' %}
                                         {% set src = 'data:image/' ~ mime_type ~ ';base64,' ~ value %}
                                     {% endif %}
 
@@ -253,7 +253,7 @@
 
                 html += `
     <div class="mb-3">
-        <label class="form-label fw-bold">${label}</label>
+        <label class="form-label">${label}</label>
         <div class="border rounded p-3 bg-light text-center">
             <img src="${imageSrc}"
                  alt="Current ${label}"
@@ -317,7 +317,33 @@
             value = '';
             type = `{{ column.type|default('text') }}`;
 
-            html += `<div class="mb-3">
+            if (field.indexOf('image') !== -1) {
+                let imageSrc = value;
+                if (value.length > 0 && !value.startsWith('data:image/')) {
+                    imageSrc = `data:image/${mimeType};base64,${value}`;
+                }
+
+                html += `
+                    <div class="mb-3">
+                        <label class="form-label">${label}</label>
+                        <div class="border rounded p-3 bg-light text-center">
+                            <img src="${imageSrc}"
+                                 alt="Current ${label}"
+                                 class="img-thumbnail mb-3"
+                                 style="max-height: 180px; max-width: 100%;">
+                            <div>
+                                <input type="file"
+                                       accept="image/*"
+                                       class="form-control form-control-sm"
+                                       id="${field}"
+                                       name="${field}">
+                                <small class="text-muted">Choose new image (optional)</small>
+                            </div>
+                        </div>
+                    </div>`;
+            } else {
+
+                html += `<div class="mb-3">
                     <label for="${field}" class="form-label">${label}</label>
                     <input type="${type === 'password' ? 'password' : 'text'}"
                            class="form-control"
@@ -326,6 +352,7 @@
                            placeholder="${label}"
                            value='${value}'>
                 </div>`;
+            }
             {% endfor %}
 
             modalBody.innerHTML = html;