autonomous-app 0.2.17__tar.gz → 0.2.19__tar.gz

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.2.17
+Version: 0.2.19
 Summary: Containerized application framework built on Flask with additional libraries and tools for rapid development of web applications.
 Author-email: Steven A Moore <samoore@binghamton.edu>
 License: MIT License

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/src/autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.17"
+__version__ = "0.2.19"
 
 from .logger import log
 from .model.automodel import AutoModel

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/src/autonomous/ai/oaiagent.py

@@ -194,7 +194,7 @@ class OAIAgent(AutoModel):
             },
             {"role": "user", "content": text},
         ]
-        response = self.client.chat.completions.create(model="gpt-4", messages=message)
+        response = self.client.chat.completions.create(model="gpt-4o", messages=message)
         try:
             result = response.choices[0].message.content
         except Exception as e:

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/src/autonomous/logger.py

@@ -28,6 +28,8 @@ class Logger:
         level = os.environ.get("LOG_LEVEL") or self.logger.level
         self.logger.setLevel(log_levels.get(level, "DEBUG"))
         self.enabled = True
+        if not os.path.exists("logs"):
+            os.makedirs("logs")
         self.logfile = "logs/current_run_error_log.log"
         self.logarchive = (
             f"logs/error_log-{datetime.datetime.now().strftime('%Y-%m-%d')}.log"

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/src/autonomous/model/automodel.py

@@ -2,7 +2,6 @@
 # default : Optional[str] = "value"  # for default values
 import copy
 import importlib
-import json
 from abc import ABC
 from datetime import datetime
 
@@ -119,12 +118,18 @@ class AutoModel(ABC):
                 v = v.default
             setattr(obj, k, result.get(k, copy.deepcopy(v)))
         obj.pk = pk
+        for key, val in list(kwargs.items()):
+            if (
+                getattr(cls, key, None)
+                and getattr(cls, key).fset
+                and f"_{key}" in cls.attributes
+            ):
+                kwargs[f"_{key}"] = kwargs.pop(key)
         obj.__dict__ |= kwargs
         # breakpoint()
         obj.__dict__ = AutoDecoder.decode(obj.__dict__)
         obj._automodel = obj.model_name(qualified=True)
         obj.last_updated = datetime.now()
-
         return obj
 
     def __getattribute__(self, name):
@@ -249,20 +254,24 @@ class AutoModel(ABC):
                 val = getattr(self, key)
                 if vattr.type == "TEXT":
                     if not isinstance(val, str):
-                        raise TypeError(f"Value must be a string, not {type(val)}")
+                        raise TypeError(
+                            f"{key} value must be a string, not {type(val)}"
+                        )
                 elif vattr.type == "NUMERIC":
                     if not isinstance(val, (int, float)):
-                        raise TypeError(f"Value must be a number, not {type(val)}")
+                        raise TypeError(
+                            f"{key} value must be a number, not {type(val)}"
+                        )
                 elif vattr.type == "MODEL":
                     # log(isinstance(val, (AutoModel, DelayedModel)), type(val))
                     if val is not None and not isinstance(
                         val, (AutoModel, DelayedModel)
                     ):
                         raise TypeError(
-                            f"Value must be an AutoModel or None, not {type(val)}"
+                            f"{key} value must be an AutoModel or None, not {type(val)}"
                         )
                 else:
-                    raise ValueError(f"Invalid type {self.type}")
+                    raise ValueError(f"{key}: Invalid type {self.type}")
 
                 if vattr.required and val is None:
                     raise ValueError(f"{key} is required")

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/src/autonomous/storage/imagestorage.py

@@ -3,7 +3,7 @@ import os
 import shutil
 import uuid
 
-from PIL import Image
+from PIL import Image, UnidentifiedImageError
 
 from autonomous import log
 
@@ -24,13 +24,17 @@ class ImageStorage:
     def _resize_image(self, asset_id, max_size=1024):
         # log("Resizing image", asset_id, max_size)
         file_path = f"{self.get_path(asset_id)}/orig.webp"
-        with Image.open(file_path) as img:
-            resized_img = img.copy()
-            max_size = self._sizes.get(max_size) or int(max_size)
-            resized_img.thumbnail((max_size, max_size))
-            img_byte_arr = io.BytesIO()
-            resized_img.save(img_byte_arr, format="WEBP")
-            return img_byte_arr.getvalue()
+        try:
+            with Image.open(file_path) as img:
+                resized_img = img.copy()
+                max_size = self._sizes.get(max_size) or int(max_size)
+                resized_img.thumbnail((max_size, max_size))
+                img_byte_arr = io.BytesIO()
+                resized_img.save(img_byte_arr, format="WEBP")
+                return img_byte_arr.getvalue()
+        except UnidentifiedImageError as e:
+            log(f"Error resizing image: {e}")
+            return None
 
     def _convert_image(self, raw, crop=False):
         with Image.open(io.BytesIO(raw)) as img:
@@ -66,25 +70,40 @@ class ImageStorage:
         original_path = f"{self.get_path(asset_id)}"
         # log(f"Getting image: {asset_id}.{size}", original_path)
         if not os.path.exists(original_path):
-            # log(f"Original image not found: {original_path}")
+            log(f"Original image not found: {original_path}")
             return ""
         file_path = f"{original_path}/{size}.webp"
         # log(file_path)
+        result_url = f"/{file_path}"
+        # log(
+        #     f"{asset_id}",
+        #     size,
+        #     os.path.exists(original_path),
+        #     os.path.exists(file_path),
+        # )
         if (
             size != "orig"
             and os.path.exists(original_path)
             and not os.path.exists(file_path)
         ):
             # If the file doesn't exist, create it
-            result = self._resize_image(asset_id, size)
-            with open(file_path, "wb") as asset:
-                asset.write(result)
-        result_url = (
-            f"/{file_path}"
-            if not full_url
-            else f"{os.environ.get('APP_BASE_URL', '')}/{file_path}"
-        )
-        # log(f"Returning image url: {result_url}")
+            if result := self._resize_image(asset_id, size):
+                with open(file_path, "wb") as asset:
+                    asset.write(result)
+                result_url = (
+                    f"/{file_path}"
+                    if not full_url
+                    else f"{os.environ.get('APP_BASE_URL', '')}/{file_path}"
+                )
+            else:
+                log(
+                    f"Error resizing image: {asset_id}",
+                    size,
+                    os.path.exists(original_path),
+                    os.path.exists(file_path),
+                )
+                self.remove(asset_id)
+        # log(f"Returning image: {result_url}")
         return result_url
 
     def get_path(self, asset_id):

{autonomous_app-0.2.17 → autonomous_app-0.2.19}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.2.17
+Version: 0.2.19
 Summary: Containerized application framework built on Flask with additional libraries and tools for rapid development of web applications.
 Author-email: Steven A Moore <samoore@binghamton.edu>
 License: MIT License