Release v0.2.169

Updates to CRUD for automatically saving images.

Author: andrevanzuydam

pyproject.toml

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

src/__init__.py

@@ -1,10 +1,37 @@
 import asyncio
 from tina4_python.Migration import migrate
-from tina4_python import get, post, put, delete, middleware, description, Database, secured, HTTP_OK, noauth
+from tina4_python import get, post, put, delete, middleware, description, Database, secured, HTTP_OK, noauth, Debug, orm
+
+
+
 
 dba = Database("sqlite3:data.db")
 
 migrate(dba)
+orm(dba)
+
+# from .orm.User import User
+# user = User({"id": 1, "username": "john", "email": "john@doe.com"})
+# user.id = 1
+# user.username = "moo"
+# user.email = "test"
+#
+# if not dba.table_exists("user"):
+#     Debug.info (user.create_table())
+#     dba.execute(user.create_table())
+#
+# user.save()
+
+
+@get("/users/landing")
+async def get_users_landing(request, response):
+    from .orm.User import User
+
+    crud_users = User().select("*").to_crud(request, {"card_view": True})
+
+    return response.render("{{crud_users}}", {"crud_users": crud_users})
+
+
 
 @get("/system/employees")
 async def get_employees(request, response):

tina4_python/CRUD.py

@@ -252,6 +252,21 @@ def to_crud(self, request, options=None):
 
             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 +300,21 @@ async def get_record(request, response):
 
             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)

tina4_python/FieldTypes.py

@@ -9,6 +9,7 @@
 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 @@ def __init__(self, column_name=None, primary_key=False, default_value=None, auto
             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/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 @@ def to_dict(self):
 
                 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/__init__.py

@@ -217,7 +217,7 @@ def start_in_thread(target, exception_hook=None):
 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 @@ def start_in_thread(target, exception_hook=None):
     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/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;