dmart 0.1.9__py3-none-any.whl → 1.4.0__py3-none-any.whl

api/managed/utils.py

@@ -469,22 +469,23 @@ async def serve_request_update(request, owner_shortname: str):
                 schema_shortname=record_schema_shortname,
             )
 
-            requested_checksum = record.attributes.get("last_checksum_history")
-            if requested_checksum:
-                latest_history = await db.get_latest_history(
-                    space_name=request.space_name,
-                    subpath=record.subpath,
-                    shortname=record.shortname,
-                )
-                if latest_history and latest_history.last_checksum_history != requested_checksum:
-                    raise api.Exception(
-                        status.HTTP_409_CONFLICT,
-                        api.Error(
-                            type="request",
-                            code=InternalErrorCode.CONFLICT,
-                            message="Resource has been updated by another request!",
-                        ),
+            if settings.is_sha_required:
+                requested_checksum = record.attributes.get("last_checksum_history")
+                if requested_checksum:
+                    latest_history = await db.get_latest_history(
+                        space_name=request.space_name,
+                        subpath=record.subpath,
+                        shortname=record.shortname,
                     )
+                    if latest_history and latest_history.last_checksum_history != requested_checksum:
+                        raise api.Exception(
+                            status.HTTP_409_CONFLICT,
+                            api.Error(
+                                type="request",
+                                code=InternalErrorCode.CONFLICT,
+                                message="Resource has been updated by another request!",
+                            ),
+                        )
 
             # CHECK PERMISSION
             if not await access_control.check_access(
@@ -1534,22 +1535,23 @@ async def serve_space_update(request, record, owner_shortname: str, is_replace:
         user_shortname=owner_shortname,
     )
 
-    requested_checksum = record.attributes.get("last_checksum_history")
-    if requested_checksum:
-        latest_history = await db.get_latest_history(
-            space_name=space.shortname,
-            subpath=record.subpath,
-            shortname=space.shortname,
-        )
-        if latest_history and latest_history.last_checksum_history != requested_checksum:
-            raise api.Exception(
-                status.HTTP_409_CONFLICT,
-                api.Error(
-                    type="request",
-                    code=InternalErrorCode.CONFLICT,
-                    message="Resource has been updated by another request. Please refresh and try again.",
-                ),
+    if settings.is_sha_required:
+        requested_checksum = record.attributes.get("last_checksum_history")
+        if requested_checksum:
+            latest_history = await db.get_latest_history(
+                space_name=space.shortname,
+                subpath=record.subpath,
+                shortname=space.shortname,
             )
+            if latest_history and latest_history.last_checksum_history != requested_checksum:
+                raise api.Exception(
+                    status.HTTP_409_CONFLICT,
+                    api.Error(
+                        type="request",
+                        code=InternalErrorCode.CONFLICT,
+                        message="Resource has been updated by another request. Please refresh and try again.",
+                    ),
+                )
 
     old_flat = flatten_dict(old_space.model_dump())
     new_flat = flatten_dict(space.model_dump())

data_adapters/sql/adapter.py

@@ -1379,7 +1379,7 @@ class SQLAdapter(BaseDataAdapter):
                         ffv_resource_type.append(perm_key_splited[2])
 
         if len(ffv_spaces):
-            perm_key_splited_query = f'@space_name:{'|'.join(ffv_spaces)} @subpath:{f"/{'|/'.join(ffv_subpath)}"} @resource_type:{'|'.join(ffv_resource_type)} {' '.join(ffv_query)}'
+            perm_key_splited_query = f'@space_name:{"|".join(ffv_spaces)} @subpath:/{"|/".join(ffv_subpath)} @resource_type:{"|".join(ffv_resource_type)} {" ".join(ffv_query)}'
             if query.search:
                 query.search += f' {perm_key_splited_query}'
             else:
@@ -2146,7 +2146,7 @@ class SQLAdapter(BaseDataAdapter):
 
             return history_diff
         except Exception as e:
-            print("[!store_entry_diff]", e)
+            print("[!store_entry_diff]", e, old_version_flattend, new_version_flattend)
             logger.error(f"Failed parsing an entry. Error: {e}")
             return {}
 
@@ -2466,7 +2466,7 @@ class SQLAdapter(BaseDataAdapter):
         try:
             return await self.load(space_name, "/", space_name, core.Space)
         except Exception as e:
-            print("[!fetch_space]", e)
+            print("[!fetch_space]", e, space_name)
             return None
 
     async def set_user_session(self, user_shortname: str, token: str) -> bool:

{dmart-0.1.9.dist-info → dmart-1.4.0.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 0.1.9
-Requires-Python: >=3.10
+Version: 1.4.0
+Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic
 Requires-Dist: pydantic[email]
@@ -19,7 +19,6 @@ Requires-Dist: pydantic-settings
 Requires-Dist: fastapi-sso
 Requires-Dist: sqlmodel
 Requires-Dist: psycopg[binary]
-Requires-Dist: asyncpg
 Requires-Dist: greenlet
 Requires-Dist: alembic
 Requires-Dist: jinja2

{dmart-0.1.9.dist-info → dmart-1.4.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 main.py,sha256=XqKHlgFy_S_EtvbGsSxiCMSApSU33BlTpv8T4UWX0yc,17351
 migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
-run_notification_campaign.py,sha256=wKo8B79eiATOmAnxXsOJkSvb5BGwZTAQuxN6-HfA7Ws,2907
+run_notification_campaign.py,sha256=ZCvHfaimK4W6q4XuHs2r6wavMGipYYw4aUkNlxmGUd8,2652
 scheduled_notification_handler.py,sha256=m26TryqHuvXR5PUPvzY9nFnpJpfbsuRjc_Q6wHdxvE8,4643
 schema_migration.py,sha256=a1w3c-fSm95MVWFzobgy0AxIbhbzMDSfD46easTmwKE,6132
 schema_modulate.py,sha256=vB7NxvqghqNpFe__p0ll03WsvNftzxBbQ6UXB2UfxNU,6454
@@ -40,7 +40,7 @@ api/info/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api/info/router.py,sha256=sQZZor7A-uDzsJX39aqEA7bMZOJ-WTitYeFvVNWfaHw,3938
 api/managed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api/managed/router.py,sha256=0xfJ3NXV3XHyG8yWLEECBJt-XppymOxYuMDvQJdO1MI,50865
-api/managed/utils.py,sha256=OZgqqWAKMXqhFOloBcm85KiE4BpZ8h0CNffK8O7Pc7c,72639
+api/managed/utils.py,sha256=KyDqnGK_ndX2Uy47FmrPHmu6PpZ35IhgjGjA816x-uY,72841
 api/public/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api/public/router.py,sha256=TrraWs2LGL_c_JRDbvS8OHm3fJ-ZKF7o4El7wvjV4Mk,24753
 api/qr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -70,7 +70,7 @@ data_adapters/file/drop_index.py,sha256=OK3wXwaO9tUcHcJjqyLeBnkElzK35MZMi8YLGWdr
 data_adapters/file/health_check.py,sha256=cMvwsXhjEykjrTyB3HtUn8QqKdtB_h5w8mGOEYPepzU,24221
 data_adapters/file/redis_services.py,sha256=83STcca5fYFaEVLRYAxfUQXeUQZqJOT8XH-GBSbkR-E,39914
 data_adapters/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-data_adapters/sql/adapter.py,sha256=xdd5EcZU1fF4GTBxSg4BUyKvd8o95kcf1FqtPHUN2u8,154514
+data_adapters/sql/adapter.py,sha256=MlNRWjUigjjS2SRzDYNaUOsGwTFPHZQn-o0DXxKKHl8,154565
 data_adapters/sql/adapter_helpers.py,sha256=Eu22NElz2fMu6zyOsGsGrnAZcyWhHz9I__RJ9z6cwK0,15076
 data_adapters/sql/create_tables.py,sha256=KqaXHTDOD8YaqGNc_e0iHHotd0WE3Kad_tBevtoGA20,17427
 data_adapters/sql/create_users_folders.py,sha256=fm3P-CMcPX4b4DqXHKWMOtfX4RHdaev2nCDhYrS5cIs,1911
@@ -82,7 +82,7 @@ languages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 languages/arabic.json,sha256=UL61rP9_M42CGfU94G5-1bXVUVnsJWXzoqhaXTXTJuM,910
 languages/english.json,sha256=Y7eZ2X8c427_97qYrHOeGb2d725T-YlNNFVSi8FB7Kw,649
 languages/kurdish.json,sha256=GgPLkVKyhIQjT7h3cPfDh0oyzg26znvBUe5X_Zz2TWI,864
-languages/loader.py,sha256=yaBJHGVRxi8Z-H8x4MOQcwyhiY0zD9UY-m0AjLi4eq8,393
+languages/loader.py,sha256=3gf2WmfSQ-AVIpyLAm_5J5NcQlWqBxQHMjcUd04Pijs,381
 models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 models/api.py,sha256=f5X56dudyEysPmDuI5grM2RRCXuIQoehaAB6wMAGG28,6473
 models/core.py,sha256=tEb7cbnC71yE9SDluynj7dE3U8Ed-EbF3uRJizy-uuU,16880
@@ -103,7 +103,7 @@ plugins/redis_db_update/plugin.py,sha256=z05k1zNJgBnKPj-jrtMUeI9br75ZPlifbzL0Hxp
 plugins/resource_folders_creation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plugins/resource_folders_creation/plugin.py,sha256=OwYPtRjMt2esAAEdv1FjdZgjEz01yt2xOZQi3nB0kEQ,3327
 plugins/system_notification_sender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugins/system_notification_sender/plugin.py,sha256=96xzmuUGvO2WOJ5y90akDoRB7Bqy-VpOo6ht8-rLLtQ,8253
+plugins/system_notification_sender/plugin.py,sha256=MUOujwyRJ3yQrXwZ-X4qSdx0ZNU2c-sYy0d0-U8twoA,8253
 plugins/update_access_controls/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plugins/update_access_controls/plugin.py,sha256=43UV4vg-zxBF_7Bv0AZH6gU0Bgy2ybapNK21wJTF05k,301
 pytests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -121,7 +121,7 @@ utils/access_control.py,sha256=8cCKr-6bL-Shl8j8xtfjEykMPGy6wkbNz-NRwLCdx-Y,11757
 utils/async_request.py,sha256=Lm2xGXLeph7P1_fLhhNJDhPubKT2ncFn_Ueft4JVoeI,255
 utils/exporter.py,sha256=HjcZCzcuH6N6f7Gn2hkTEeEFyo-MfrsiZUYAE-9kkVQ,9718
 utils/firebase_notifier.py,sha256=nAeCUo5Mtwxygwj8ONlw8ZAtL_ekdJBabvU0z2dZ3NY,2391
-utils/generate_email.py,sha256=_yHJiYp9dd1IT2lL2N2VmPrsCuKN30YTmE0votM9It8,1132
+utils/generate_email.py,sha256=25i1iNVDfyRDq7vvZVFkaTYfMZFkAg1ZVQO2GdK7yRQ,1122
 utils/helpers.py,sha256=gNxLg09cclRWrKNBy2pwGZsxGA0iFS5iZ_nyra3SmnI,9928
 utils/hypercorn_config.py,sha256=q28HGRLWo9wjOVF183WwFPs3HQo4Nexc7q_7dmSVHRI,311
 utils/internal_error_code.py,sha256=KGlXPC5YruPmb0ORVY7U3EEVpBgSLuU4lHdXgwUVN2M,1637
@@ -130,20 +130,20 @@ utils/logger.py,sha256=peejQnq9B0eaHwdLynBHT7FUCq7jCX_DhkX6BcxrLkA,5274
 utils/middleware.py,sha256=PAVwnLzs0cyT_ZIgc1slqadEOJNCPliLhOTjaYx0Waw,3399
 utils/notification.py,sha256=O9oOeU9cRm3e9UAc-VJONWx-TzqbCMddFNaTQilE6ks,2479
 utils/password_hashing.py,sha256=NZZsmtPG9Vkocipk3DlDKKHKUdxRKA4yOhCurD8dUhg,356
-utils/plugin_manager.py,sha256=nIu99A8BWDhGerL880o5K9pCVQZbnjHJPNo1wQ_UbfU,7900
+utils/plugin_manager.py,sha256=brQoE4u2WxH6EMvUOYQlnOnSUbKwha92-UfAgWUaHRU,7645
 utils/query_policies_helper.py,sha256=jBcNI_15P6LqVeWz6w9UMreLuNIc50GxqAf17KzxE84,4392
 utils/regex.py,sha256=cv9b_l_e8tz42mKckeeyDgypKqh2e71E28co2iuEVxA,2286
 utils/repository.py,sha256=9L-IvQ0Js0SQ5OR-Rh0i2Wdu4H9H06r8eE84hfBIu7Q,18313
 utils/router_helper.py,sha256=Tgoq3oakejdEeyeVieTNk38JsPZ8x5RuR0kw2THc1mI,604
-utils/settings.py,sha256=jKesIr67J9RP-QwrzsUQzXRAGjqpvYGUhmPuGY_GNpI,5639
+utils/settings.py,sha256=SIunwTJF0Ac9fUWRt3sUsgWzMkWk0RUryEANYuOJQ9k,5660
 utils/sms_notifier.py,sha256=04D6D_ldk3S9SojI7_381pqLc8v9lligeNHAysohz7w,550
 utils/social_sso.py,sha256=Dm1W6U9OwKbAeUwM-kwJBHFEoreeoN-s-RHdOZ1-cNg,2216
 utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,7005
 utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-0.1.9.dist-info/METADATA,sha256=Qoj8pMpyCZ9uJXFJxfuOeofT0WOWqlvGwW-vYUbql3s,2091
-dmart-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-0.1.9.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-0.1.9.dist-info/top_level.txt,sha256=JTypu1r5v9v7ru-60JSSbnSMEESHFRMacpcz-rPJx_U,262
-dmart-0.1.9.dist-info/RECORD,,
+dmart-1.4.0.dist-info/METADATA,sha256=vxNYgfiH0Y8TWKyFOmiXTx69CA-SOILtIqnt2Mj-7kY,2068
+dmart-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.0.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.0.dist-info/top_level.txt,sha256=JTypu1r5v9v7ru-60JSSbnSMEESHFRMacpcz-rPJx_U,262
+dmart-1.4.0.dist-info/RECORD,,

languages/loader.py

@@ -1,4 +1,3 @@
-import glob
 import json
 from pathlib import Path
 

plugins/system_notification_sender/plugin.py

@@ -69,7 +69,7 @@ class Plugin(PluginBase):
             retrieve_json_payload=True,
             space_name="management",
             subpath="notifications/system",
-            search=f"@payload.body.on_space:{data.space_name} @payload.body.on_subpath:{data.subpath.lstrip("/")} @payload.body.on_action:{data.action_type}",
+            search=f"@payload.body.on_space:{data.space_name} @payload.body.on_subpath:{data.subpath.lstrip('/')} @payload.body.on_action:{data.action_type}",
             limit=30,
             offset=0
         ), "dmart")

run_notification_campaign.py

@@ -11,22 +11,9 @@ from utils.settings import settings
 CUSTOM_PLUGINS_PATH = settings.spaces_folder / "custom_plugins"
 
 # Allow python to search for modules inside the custom plugins
-# be including the path to the parent folder of the custom plugins to sys.path
-back_out_of_project = 2
-back_to_spaces = 0
-
-for part in CUSTOM_PLUGINS_PATH.parts:
-    if part == "..":
-        back_to_spaces += 1
-
-if __file__.endswith(".pyc"):
-    back_out_of_project += 1
-
-sys.path.append(
-    "/".join(__file__.split("/")[:-(back_out_of_project+back_to_spaces)]) + 
-    "/" +
-    "/".join(CUSTOM_PLUGINS_PATH.parts[back_to_spaces:-1])
-)
+# by including the path to the parent folder of the custom plugins to sys.path
+if CUSTOM_PLUGINS_PATH.parent.exists():
+    sys.path.append(str(CUSTOM_PLUGINS_PATH.parent.resolve()))
 
 def load_notification_plugin():
     # Load the plugin module

utils/generate_email.py

@@ -1,4 +1,3 @@
-import os
 from jinja2 import Environment, FileSystemLoader
 from pathlib import Path
 

utils/plugin_manager.py

@@ -21,22 +21,9 @@ from utils.settings import settings
 CUSTOM_PLUGINS_PATH = settings.spaces_folder / "custom_plugins"
 
 # Allow python to search for modules inside the custom plugins
-# be including the path to the parent folder of the custom plugins to sys.path
-back_out_of_project = 2
-back_to_spaces = 0
-
-for part in CUSTOM_PLUGINS_PATH.parts:
-    if part == "..":
-        back_to_spaces += 1
-
-if __file__.endswith(".pyc"):
-    back_out_of_project += 1
-
-sys.path.append(
-    "/".join(__file__.split("/")[:-(back_out_of_project+back_to_spaces)]) + 
-    "/" +
-    "/".join(CUSTOM_PLUGINS_PATH.parts[back_to_spaces:-1])
-)
+# by including the path to the parent folder of the custom plugins to sys.path
+if CUSTOM_PLUGINS_PATH.parent.exists():
+    sys.path.append(str(CUSTOM_PLUGINS_PATH.parent.resolve()))
 
 class PluginManager:
 

utils/settings.py

@@ -5,7 +5,6 @@ import os
 import re
 import string
 import random
-import sys
 from venv import logger
 
 from pydantic import Field
@@ -78,6 +77,7 @@ class Settings(BaseSettings):
     session_inactivity_ttl: int = 0 # Set initially to 0 to disable session timeout. Possible value : 60 * 60 * 24 * 7  # 7 days
     request_timeout: int = 35 # In seconds the time of dmart requests.
     jq_timeout: int = 2 # secs
+    is_sha_required: bool = False
 
     url_shorter_expires: int = 60 * 60 * 48  # 48 hours
 
@@ -157,7 +157,7 @@ try:
         Settings()
     )
 except Exception as e:
-    # logger.error(f"Failed to load settings.\nError: {e}")
+    logger.error(f"Failed to load settings.\nError: {e}")
     # sys.exit(1)
     pass