autonomous-app 0.3.1__tar.gz → 0.3.2__tar.gz

{autonomous_app-0.3.1 → autonomous_app-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.1
+Version: 0.3.2
 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.3.1 → autonomous_app-0.3.2}/src/autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.01"
+__version__ = "0.3.2"
 
 from dotenv import load_dotenv
 

{autonomous_app-0.3.1 → autonomous_app-0.3.2}/src/autonomous/model/autoattr.py

@@ -103,7 +103,7 @@ class DictAttr(DictField):
     def __get__(self, instance, owner):
         # log(instance, owner)
         results = super().__get__(instance, owner) or {}
-        log(self.name, self.field, owner, results)
+        # log(self.name, self.field, owner, results)
         for key, lazy_obj in results.items():
             try:
                 if hasattr(lazy_obj, "fetch"):

{autonomous_app-0.3.1 → autonomous_app-0.3.2}/src/autonomous/model/automodel.py

@@ -137,7 +137,14 @@ class AutoModel(Document):
         Returns:
             list: A list of AutoModel instances that match the search criteria.
         """
-        results = cls.objects(**kwargs)
+        new_kwargs = {}
+        for k, v in kwargs.items():
+            if isinstance(v, str):
+                new_k = f"{k}__icontains"
+                new_kwargs[new_k] = v
+            else:
+                new_kwargs[k] = v
+        results = cls.objects(**new_kwargs)
         if _order_by:
             results = results.order_by(*_order_by)
         if _limit:

{autonomous_app-0.3.1 → autonomous_app-0.3.2}/src/autonomous/storage/imagestorage.py

@@ -1,3 +1,4 @@
+import glob
 import io
 import os
 import shutil
@@ -14,6 +15,12 @@ class ImageStorage:
     def __init__(self, path="static/images"):
         self.base_path = path
 
+    def scan_storage(self, path=None):
+        for root, dirs, files in os.walk(path or self.base_path):
+            for file in files:
+                if file == "orig.webp":
+                    yield os.path.join(root, file)
+
     @classmethod
     def _get_key(cls, folder="", pkey=None):
         if folder and not folder.endswith("/"):
@@ -68,10 +75,10 @@ class ImageStorage:
         if not asset_id:
             return ""
         original_path = f"{self.get_path(asset_id)}"
-        # log(f"Getting image: {asset_id}.{size}", original_path)
+        # log(f"Getting image: {asset_id}", original_path)
         if not os.path.exists(original_path):
             log(f"Original image not found: {original_path}")
-            return ""
+            return None
         file_path = f"{original_path}/{size}.webp"
         # log(file_path)
         result_url = f"/{file_path}"
@@ -104,10 +111,7 @@ class ImageStorage:
 
     def get_path(self, asset_id):
         if asset_id:
-            asset_path = asset_id.replace(".", "/")
-            if asset_path.endswith("/"):
-                asset_path = asset_path[:-1]
-            return os.path.join(self.base_path, f"{asset_path}")
+            return os.path.join(self.base_path, f"{asset_id}")
         else:
             return self.base_path
 
@@ -124,8 +128,45 @@ class ImageStorage:
         return imgs
 
     def remove(self, asset_id):
+        if not asset_id:
+            return False
+        file_path = self.get_path(asset_id)
+        if os.path.isdir(file_path):
+            print(f"Removing {file_path}")
+            # return shutil.rmtree(file_path, ignore_errors=True)
+        return False
+
+    def clear_cached(self, asset_id):
         file_path = self.get_path(asset_id)
         if os.path.isdir(file_path):
-            shutil.rmtree(file_path)
-            return True
+            for file in glob.glob(os.path.join(file_path, "*")):
+                if os.path.basename(file) != "orig.webp":
+                    os.remove(file)
+        return False
+
+    def rotate(self, asset_id, amount=-90):
+        file_path = self.get_path(asset_id)
+        log(asset_id)
+        with Image.open(f"{file_path}/orig.webp") as img:
+            # Rotate the image 90 degrees
+            rotated_img = img.rotate(amount, expand=True)
+            # Save the rotated image
+            log(img, rotated_img)
+            # img = img.copy()
+            # img_byte_arr = io.BytesIO()
+            # img.save(img_byte_arr, )
+            self.clear_cached(asset_id)
+            rotated_img.save(f"{file_path}/orig.webp", format="WEBP")
+        return False
+
+    def flip(self, asset_id, flipx=True, flipy=True):
+        file_path = self.get_path(asset_id)
+        with Image.open(f"{file_path}/orig.webp") as img:
+            if flipx:
+                rotated_img = img.transpose(Image.FLIP_LEFT_RIGHT)
+            if flipy:
+                rotated_img = img.transpose(Image.FLIP_TOP_BOTTOM)
+            # Save the rotated image
+            rotated_img.save(f"{file_path}/orig.webp", format="WEBP")
+            self.clear_cached(asset_id)
         return False

{autonomous_app-0.3.1 → autonomous_app-0.3.2}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.1
+Version: 0.3.2
 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