zango 0.2.2.dev0__tar.gz → 0.3.0__tar.gz

{zango-0.2.2.dev0/src/zango.egg-info → zango-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zango
-Version: 0.2.2.dev0
+Version: 0.3.0
 Summary: Zango: multi-tenant Django framework for building business apps
 Home-page: https://github.com/Healthlane-Technologies/zelthy3
 Author: Zelthy ("Healthlane Technologies")
@@ -13,10 +13,10 @@ Classifier: Development Status :: 5 - Production/Stable
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: django==4.2.11
-Requires-Dist: psycopg2-binary
-Requires-Dist: django-tenants
-Requires-Dist: djangorestframework
-Requires-Dist: django-rest-knox
+Requires-Dist: psycopg2-binary==2.9.9
+Requires-Dist: django-tenants==3.6.1
+Requires-Dist: djangorestframework==3.15.2
+Requires-Dist: django-rest-knox==4.2.0
 Requires-Dist: celery==5.3.1
 Requires-Dist: flake8==6.1.0
 Requires-Dist: django-cors-headers==4.2.0
@@ -49,6 +49,37 @@ Requires-Dist: django-ipware==7.0.1
 Requires-Dist: django-decorator-include==3.0
 Requires-Dist: setuptools==70.1.1
 Requires-Dist: django-axes==6.4.0
+Requires-Dist: packaging==24.1
+Requires-Dist: opentelemetry-api==1.22.0
+Requires-Dist: opentelemetry-distro==0.43b0
+Requires-Dist: opentelemetry-exporter-otlp==1.22.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-common==1.22.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.22.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.22.0
+Requires-Dist: opentelemetry-instrumentation==0.43b0
+Requires-Dist: opentelemetry-instrumentation-asgi==0.43b0
+Requires-Dist: opentelemetry-instrumentation-aws-lambda==0.43b0
+Requires-Dist: opentelemetry-instrumentation-boto3sqs==0.43b0
+Requires-Dist: opentelemetry-instrumentation-botocore==0.43b0
+Requires-Dist: opentelemetry-instrumentation-celery==0.43b0
+Requires-Dist: opentelemetry-instrumentation-dbapi==0.43b0
+Requires-Dist: opentelemetry-instrumentation-django==0.43b0
+Requires-Dist: opentelemetry-instrumentation-grpc==0.43b0
+Requires-Dist: opentelemetry-instrumentation-jinja2==0.43b0
+Requires-Dist: opentelemetry-instrumentation-logging==0.43b0
+Requires-Dist: opentelemetry-instrumentation-psycopg2==0.43b0
+Requires-Dist: opentelemetry-instrumentation-redis==0.43b0
+Requires-Dist: opentelemetry-instrumentation-requests==0.43b0
+Requires-Dist: opentelemetry-instrumentation-sqlite3==0.43b0
+Requires-Dist: opentelemetry-instrumentation-urllib==0.43b0
+Requires-Dist: opentelemetry-instrumentation-urllib3==0.43b0
+Requires-Dist: opentelemetry-instrumentation-wsgi==0.43b0
+Requires-Dist: opentelemetry-propagator-aws-xray==1.0.1
+Requires-Dist: opentelemetry-proto==1.22.0
+Requires-Dist: opentelemetry-sdk==1.22.0
+Requires-Dist: opentelemetry-semantic-conventions==0.43b0
+Requires-Dist: opentelemetry-util-http==0.43b0
+Requires-Dist: loguru==0.7.2
 
 <h1 align="center">
     <a target="_blank" href="https://www.zelthy.com/framework?referer=zelthy3-repo-landing"> 
@@ -65,7 +96,7 @@ Requires-Dist: django-axes==6.4.0
   <a href="#">
         <img alt="PyPI version" src="https://badge.fury.io/py/zango.svg"></a> 
   <a href="#">
-      <img alt="Build" src="https://img.shields.io/github/actions/workflow/status/Healthlane-Technologies/zango/sync-docs-to-docs-hub.yml?branch=main"></a> 
+      <img alt="Build" src="https://github.com/Healthlane-Technologies/Zango/actions/workflows/release-zango.yml/badge.svg"></a> 
   <a href="https://opensource.org/licenses/Apache-2.0" target="_blank">
       <img alt="License" src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"> </a>
 </p>

{zango-0.2.2.dev0 → zango-0.3.0}/README.md

@@ -13,7 +13,7 @@
   <a href="#">
         <img alt="PyPI version" src="https://badge.fury.io/py/zango.svg"></a> 
   <a href="#">
-      <img alt="Build" src="https://img.shields.io/github/actions/workflow/status/Healthlane-Technologies/zango/sync-docs-to-docs-hub.yml?branch=main"></a> 
+      <img alt="Build" src="https://github.com/Healthlane-Technologies/Zango/actions/workflows/release-zango.yml/badge.svg"></a> 
   <a href="https://opensource.org/licenses/Apache-2.0" target="_blank">
       <img alt="License" src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"> </a>
 </p>

zango-0.3.0/requirements/base.txt

@@ -0,0 +1,68 @@
+django==4.2.11
+psycopg2-binary==2.9.9
+django-tenants==3.6.1
+djangorestframework==3.15.2
+django-rest-knox==4.2.0
+celery==5.3.1
+flake8==6.1.0
+django-cors-headers==4.2.0
+pluginbase==1.0.1
+click==8.1.7
+phonenumberslite==8.13.23
+django-phonenumber-field==7.1.0
+django-redis==5.3.0
+django-cachalot==2.6.1
+django-debug-toolbar==4.2.0
+django-formtools==2.4.1
+django-crispy-forms==2.0
+crispy-bootstrap5==0.7
+cookiecutter==2.3.0
+boto3==1.28.52
+botocore==1.31.52
+django-storages==1.14
+django-celery-beat==2.5.0
+django-smtp-ssl==1.0
+PyJWT==2.8.0
+XlsxWriter==3.1.9
+pydub==0.25.1
+django-celery-results==2.5.1
+django-environ==0.11.2
+pytz==2024.1
+django-session-security==2.6.7
+beautifulsoup4==4.12.3
+python3-saml==1.16.0
+django-ipware==7.0.1
+django-decorator-include==3.0
+setuptools==70.1.1
+django-axes==6.4.0
+packaging==24.1
+opentelemetry-api==1.22.0
+opentelemetry-distro==0.43b0
+opentelemetry-exporter-otlp==1.22.0
+opentelemetry-exporter-otlp-proto-common==1.22.0
+opentelemetry-exporter-otlp-proto-grpc==1.22.0
+opentelemetry-exporter-otlp-proto-http==1.22.0
+opentelemetry-instrumentation==0.43b0
+opentelemetry-instrumentation-asgi==0.43b0
+opentelemetry-instrumentation-aws-lambda==0.43b0
+opentelemetry-instrumentation-boto3sqs==0.43b0
+opentelemetry-instrumentation-botocore==0.43b0
+opentelemetry-instrumentation-celery==0.43b0
+opentelemetry-instrumentation-dbapi==0.43b0
+opentelemetry-instrumentation-django==0.43b0
+opentelemetry-instrumentation-grpc==0.43b0
+opentelemetry-instrumentation-jinja2==0.43b0
+opentelemetry-instrumentation-logging==0.43b0
+opentelemetry-instrumentation-psycopg2==0.43b0
+opentelemetry-instrumentation-redis==0.43b0
+opentelemetry-instrumentation-requests==0.43b0
+opentelemetry-instrumentation-sqlite3==0.43b0
+opentelemetry-instrumentation-urllib==0.43b0
+opentelemetry-instrumentation-urllib3==0.43b0
+opentelemetry-instrumentation-wsgi==0.43b0
+opentelemetry-propagator-aws-xray==1.0.1
+opentelemetry-proto==1.22.0
+opentelemetry-sdk==1.22.0
+opentelemetry-semantic-conventions==0.43b0
+opentelemetry-util-http==0.43b0
+loguru==0.7.2

{zango-0.2.2.dev0 → zango-0.3.0}/setup.py

@@ -8,7 +8,7 @@ REQUIREMENTS_DIR = os.path.join(PROJECT_DIR, "requirements")
 
 README = os.path.join(PROJECT_DIR, "README.md")
 
-PLATFORM_VERSION = "0.2.2.dev"
+PLATFORM_VERSION = "0.3.0"
 
 
 def get_requirements(env):
@@ -44,7 +44,7 @@ setup(
         "Framework :: Django",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Development Status :: 5 - Production/Stable"
+        "Development Status :: 5 - Production/Stable",
     ],
     entry_points={
         "console_scripts": [

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/__init__.py

@@ -1,3 +1,3 @@
 from zango.core import internal_requests
 
-__version__ = "0.2.2.dev"
+__version__ = "0.3.0"

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/api/platform/auditlogs/v1/serializers.py

@@ -27,18 +27,14 @@ class AuditLogSerializerModel(serializers.ModelSerializer):
         return (
             obj.tenant_actor.name
             if obj.tenant_actor
-            else obj.platform_actor.name
-            if obj.platform_actor
-            else None
+            else obj.platform_actor.name if obj.platform_actor else None
         )
 
     def get_actor_type(self, obj):
         return (
             "tenant_actor"
             if obj.tenant_actor
-            else "platform_actor"
-            if obj.platform_actor
-            else None
+            else "platform_actor" if obj.platform_actor else None
         )
 
     def get_object_uuid(self, obj):

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/api/platform/auditlogs/v1/views.py

@@ -8,6 +8,7 @@ from django.db.models import Q
 from django.contrib.contenttypes.models import ContentType
 from django.db import connection
 from django.utils.decorators import method_decorator
+from django.conf import settings
 
 from zango.core.api import get_api_response, ZangoGenericPlatformAPIView
 from zango.core.api.utils import ZangoAPIPagination
@@ -27,6 +28,8 @@ class AuditLogViewAPIV1(ZangoGenericPlatformAPIView, ZangoAPIPagination):
     def process_timestamp(self, timestamp, timezone):
         try:
             ts = json.loads(timestamp)
+            if not timezone:
+                timezone = settings.TIME_ZONE
             tz = pytz.timezone(timezone)
             ts["start"] = tz.localize(
                 datetime.strptime(ts["start"] + "-" + "00:00", "%Y-%m-%d-%H:%M"),

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/api/platform/packages/v1/views.py

@@ -21,6 +21,7 @@ class PackagesViewAPIV1(ZangoGenericPlatformAPIView, ZangoAPIPagination):
     def get(self, request, app_uuid, *args, **kwargs):
         action = request.GET.get("action", None)
         tenant = self.get_app_obj(app_uuid)
+        search = request.GET.get("search", None)
         if action == "config_url":
             domains = Domain.objects.filter(tenant=tenant)
             if len(domains) == 0:
@@ -43,6 +44,10 @@ class PackagesViewAPIV1(ZangoGenericPlatformAPIView, ZangoAPIPagination):
             return get_api_response(True, resp, status)
         try:
             packages = get_all_packages(tenant.name)
+            if search:
+                packages = [
+                    obj for obj in packages if search.lower() in obj["name"].lower()
+                ]
             paginated_packages = self.paginate_queryset(packages, request, view=self)
             packages = self.get_paginated_response_data(paginated_packages)
             success = True

zango-0.3.0/src/zango/apps/dynamic_models/mixin.py

@@ -0,0 +1,64 @@
+from django.core.exceptions import ValidationError
+
+from zango.apps.appauth.models import AppUserModel, UserRoleModel
+
+
+class DynamicModelMixin:
+    """
+    Mixin class providing dynamic model functionalities and utility methods.
+    """
+
+    def create_app_user(
+        self,
+        name,
+        email,
+        mobile,
+        password,
+        role_name,
+        force_password_reset=True,
+        require_verification=True,
+    ):
+        """
+        Creates a new app user and associates them with the current object, mapping them to the specified role.
+
+        Args:
+            name (str): The name of the user.
+            email (str): The email address of the user.
+            mobile (str): The mobile number of the user.
+            password (str): The password for the user account.
+            role_name (str): The name of the role to be assigned to the user.
+            force_password_reset (bool): If True, the user will be required to reset their password on first login. Default is True.
+            require_verification (bool): If True, the user will be required to verify their account. Default is True.
+
+        Returns:
+            dict: A dictionary containing:
+                - "success" (bool): Indicates if the user creation was successful.
+                - "message" (str): A message providing additional details about the operation.
+                - "app_user" (AppUserModel or None): The created user instance if successful, otherwise None.
+
+        Raises:
+            ValidationError: If the specified role does not exist.
+
+        Notes:
+            The `app_objects` mapping is created with the given role with the current object.
+        """
+        app_objects = {}
+        role_ids = []
+
+        try:
+            user_role = UserRoleModel.objects.get(name=role_name)
+            app_objects.update({str(user_role.id): str(self.object_uuid)})
+            role_ids.append(user_role.id)
+        except UserRoleModel.DoesNotExist:
+            raise ValidationError(f"User Role {role_name} does not exist")
+
+        return AppUserModel.create_user(
+            name,
+            email,
+            mobile,
+            password,
+            role_ids,
+            force_password_reset=force_password_reset,
+            require_verification=require_verification,
+            app_objects=app_objects,
+        )

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/apps/dynamic_models/models.py

@@ -6,14 +6,12 @@ from django.db import models, connection
 from django.db.models import Q
 from django.apps import apps
 from django.core.exceptions import PermissionDenied
-from django.contrib.contenttypes.models import ContentType
 
 from zango.apps.appauth.models import AppUserModel
 from zango.core.utils import get_current_request, get_current_role
-from zango.apps.shared.platformauth.models import PlatformUserModel
 from zango.apps.dynamic_models.permissions import is_platform_user
 
-from zango.apps.object_store.models import ObjectStore
+from .mixin import DynamicModelMixin
 
 
 class RegisterOnceModeMeta(type(models.Model)):
@@ -323,7 +321,7 @@ class RestrictedManager(models.Manager):
         return qs.all()
 
 
-class DynamicModelBase(models.Model, metaclass=RegisterOnceModeMeta):
+class DynamicModelBase(models.Model, DynamicModelMixin, metaclass=RegisterOnceModeMeta):
     created_at = models.DateTimeField(auto_now_add=True)
     created_by = models.ForeignKey(
         AppUserModel, null=True, editable=False, on_delete=models.PROTECT

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/apps/dynamic_models/signals.py

@@ -13,9 +13,10 @@ def set_created_modified_by(sender, instance, **kwargs):
         instance.modified_by = user
     return
 
+
 def create_object_store_entry(sender, instance, created, **kwargs):
     if created:
-        from zango.apps.dynamic_models.models import ObjectStore
+        from zango.apps.object_store.models import ObjectStore
         from django.contrib.contenttypes.models import ContentType
 
         content_type = ContentType.objects.get_for_model(sender)

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/apps/shared/tenancy/templates/app_panel.html

@@ -1,4 +1,5 @@
 {% load static %}
+{% load zango_filters %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -18,7 +19,7 @@
     var csrf_token = "{{ csrf_token }}";
     var platform_version = "{{ platform_version }}";
   </script>
-  <script src="{% static 'app_panel/js/build.v0.3.0.min.js' %}"></script>
+  <script src="{% static 'app_panel/js/build.*.min.js'|use_latest %}"></script>
   <script src="{% static 'js/jquery/3.7.1/jquery.min.js' %}"></script>
   {% include 'session_security/all.html' %}
 </body>

{zango-0.2.2.dev0 → zango-0.3.0}/src/zango/apps/shared/tenancy/templatetags/zango_filters.py

@@ -3,6 +3,9 @@ Module containing custom template filters
 """
 
 from django import template
+from django.conf import settings
+import os
+import re
 
 register = template.Library()
 
@@ -36,3 +39,32 @@ def humanize_timedelta(timedelta_obj):
     if seconds > 0:
         time_total += " {} seconds".format(int(seconds))
     return time_total
+
+
+@register.filter()
+def use_latest(build_path):
+    """
+    Returns the latest version of a static file based on a given file path pattern.
+
+    Args:
+        build_path (str): the original file path pattern
+
+    Returns:
+        str: The path to the latest version of the file, or the original path if no match is found.
+
+    Example:
+        Usage in a Django template to reference the latest static file:
+
+        <script src="{% static 'app_panel/js/build.*.min.js'|use_latest %}"></script>
+
+        Make sure to load the zango filters with {% load zango_filters %}.
+    """
+    buildir = os.path.dirname(build_path)
+    filep = os.path.basename(build_path)
+    for dir in settings.STATICFILES_DIRS:
+        for dirpath, dirnames, filenames in os.walk(dir):
+            filenames = sorted(filenames, reverse=True)
+            for filename in filenames:
+                if re.match(filep, filename):
+                    return os.path.join(buildir, filename)
+    return build_path