Bloomerp 1.0.0.dev17__tar.gz → 1.0.0.dev19__tar.gz

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/Bloomerp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev17
+Version: 1.0.0.dev19
 Summary: Bloomerp is an open-source Business Management Software framework that lets you create fully functional business management applications just by defining your Django database models.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/Bloomerp.egg-info/SOURCES.txt

@@ -107,6 +107,7 @@ bloomerp/migrations/0020_tile_icon.py
 bloomerp/migrations/0021_workspace_is_default_workspace_name.py
 bloomerp/migrations/0022_workspace_shared_with.py
 bloomerp/migrations/0023_remove_tileonworkspace_tile_and_more.py
+bloomerp/migrations/0024_alter_bookmark_object_id_alter_documenttemplate_id_and_more.py
 bloomerp/migrations/__init__.py
 bloomerp/model_fields/code_field.py
 bloomerp/model_fields/file_field.py
@@ -119,7 +120,6 @@ bloomerp/models/activity_log.py
 bloomerp/models/application_field.py
 bloomerp/models/base_bloomerp_model.py
 bloomerp/models/definition.py
-bloomerp/models/mixins.py
 bloomerp/models/access_control/__init__.py
 bloomerp/models/access_control/field_policy.py
 bloomerp/models/access_control/policy.py
@@ -145,6 +145,14 @@ bloomerp/models/files/file.py
 bloomerp/models/files/file_folder.py
 bloomerp/models/llm/__init__.py
 bloomerp/models/llm/ai_conversation.py
+bloomerp/models/mixins/__init__.py
+bloomerp/models/mixins/absolute_url_model_mixin.py
+bloomerp/models/mixins/avatar_model_mixin.py
+bloomerp/models/mixins/content_layout_model_mixin.py
+bloomerp/models/mixins/string_search_model_mixin.py
+bloomerp/models/mixins/timestamp_model_mixin.py
+bloomerp/models/mixins/user_stamp_model_mixin.py
+bloomerp/models/mixins/uuid_model_mixin.py
 bloomerp/models/project_management/__init__.py
 bloomerp/models/project_management/todo.py
 bloomerp/models/project_management/todo_label.py

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev17
+Version: 1.0.0.dev19
 Summary: Bloomerp is an open-source Business Management Software framework that lets you create fully functional business management applications just by defining your Django database models.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/components/bookmark.py

@@ -16,7 +16,7 @@ def bookmark(request:HttpRequest) -> HttpResponse:
     # Get the content_type_id and object_id from the request
     try:
         content_type_id = int(request.GET.get('content_type_id'))
-        object_id = int(request.GET.get('object_id'))
+        object_id = str(request.GET.get('object_id') or '').strip()
     except:
         return HttpResponse(status=400)
 
@@ -66,4 +66,4 @@ def bookmark(request:HttpRequest) -> HttpResponse:
         'target' : request.htmx.target,
         'size': size
     }
-    return render(request, 'components/bookmark.html', context)
+    return render(request, 'components/bookmark.html', context)

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/components/objects/crud_object.py

@@ -22,6 +22,7 @@ def _get_detail_url(obj) -> str:
         except Exception:
             return ""
 
+
 @router.register(
     path="components/create-object/<int:content_type_id>/",
     name="components_create_object",
@@ -74,7 +75,7 @@ class CreateObjectComponentView(BloomerpCreateView):
                     "bloomerp:foreign-field-object-created": {
                         "foreign_field_widget_id": foreign_field_widget_id,
                         "content_type_id": self.content_type.pk,
-                        "object_id": self.object.pk,
+                        "object_id": str(self.object.pk),
                         "object_label": str(self.object),
                         "object_detail_url": _get_detail_url(self.object),
                     }

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/components/objects/search_objects.py

@@ -52,7 +52,7 @@ def search_objects(request:HttpRequest, content_type_id:int) -> HttpResponse:
     resp = {
         'objects' : [
             {
-                'id': obj.pk,
+                'id': str(obj.pk),
                 'string_representation': str(obj),
                 'detail_url': _get_detail_url(obj),
             } for obj in results
@@ -63,4 +63,3 @@ def search_objects(request:HttpRequest, content_type_id:int) -> HttpResponse:
         json.dumps(resp),
         content_type="application/json"
     )
-

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/components/todos.py

@@ -89,7 +89,7 @@ def todos(request: HttpRequest) -> HttpResponse:
 
 
 
-def filter_todos(user: AbstractBloomerpUser, content_type_id: int, object_id: int):
+def filter_todos(user: AbstractBloomerpUser, content_type_id: int, object_id: str):
     """
     Filter todos based on the user, content type, and object id.
     """
@@ -104,6 +104,6 @@ def initialize_form(user, content_type_id=None, object_id=None, data=None):
         """Helper function to create and initialize the form."""
         initial = {'assigned_to': user, 'requested_by' : user}
         if content_type_id and object_id:
-            initial.update({'content_type': int(content_type_id), 'object_id': int(object_id)})
+            initial.update({'content_type': int(content_type_id), 'object_id': str(object_id)})
         Form = modelform_factory(Todo, form=BloomerpModelForm, exclude=['completed', 'datetime_completed'])
-        return Form(model=Todo, user=user, initial=initial, data=data)
+        return Form(model=Todo, user=user, initial=initial, data=data)

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/components/workspaces/crud_layout_preference.py

@@ -23,14 +23,14 @@ def _get_preference_model(*, scope: str):
     return UserCreateViewPreference if scope == "create" else UserDetailViewPreference
 
 
-def _get_valid_field_ids(request: HttpRequest, *, content_type: ContentType, scope: str) -> set[int]:
+def _get_valid_field_ids(request: HttpRequest, *, content_type: ContentType, scope: str) -> set[str]:
     if scope == "create":
         return {
-            field.pk
+            str(field.pk)
             for field in get_addable_fields(content_type=content_type, user=request.user)
         }
     return {
-        int(item["id"])
+        str(item["id"])
         for item in get_available_layout_fields(
             content_type=content_type,
             user=request.user,
@@ -67,14 +67,20 @@ def _save_layout_preference(request: HttpRequest, *, scope: str | None = None) -
     layout = normalize_layout_payload(payload.get("layout"))
     valid_ids = _get_valid_field_ids(request, content_type=content_type, scope=scope)
     submitted_ids = {
-        int(item.id)
+        str(item.id)
         for row in layout.rows
         for item in row.items
-        if str(item.id).isdigit()
     }
     if not submitted_ids.issubset(valid_ids):
-        return HttpResponse("Unknown field id in layout", status=400)
-
+        invalid_ids = sorted(submitted_ids - valid_ids)
+        return JsonResponse(
+            {
+                "error": "Unknown field id in layout",
+                "invalid_ids": invalid_ids,
+            },
+            status=400,
+        )
+    
     preference_model = _get_preference_model(scope=scope)
     preference = preference_model.get_or_create_for_user(request.user, content_type)
     preference.field_layout = layout.model_dump()

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/components/workspaces/save_workspace_layout.py

@@ -32,12 +32,11 @@ def save_workspace_layout(request: HttpRequest) -> HttpResponse:
         return HttpResponse("Permission denied", status=403)
 
     layout = normalize_layout_payload(payload.get("layout"))
-    valid_ids = set(Tile.objects.values_list("id", flat=True))
+    valid_ids = {str(tile_id) for tile_id in Tile.objects.values_list("id", flat=True)}
     requested_ids = {
-        int(item.id)
+        str(item.id)
         for row in layout.rows
         for item in row.items
-        if str(item.id).isdigit()
     }
     if not requested_ids.issubset(valid_ids):
         return HttpResponse("Unknown tile id in layout", status=400)

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/management/commands/save_application_fields.py

@@ -68,6 +68,11 @@ class Command(BaseCommand):
                             meta = {}
                             field_type = field.get_internal_type()
 
+                            # UUID-backed primary keys should not become selectable
+                            # ApplicationFields for CRUD layouts or permissions.
+                            if getattr(field, "primary_key", False):
+                                continue
+
                             try:
                                 # Get database column for field
                                 if hasattr(field, 'db_column') or hasattr(field, 'column'):
@@ -205,4 +210,3 @@ class Command(BaseCommand):
 
         self.stdout.write(self.style.SUCCESS('ApplicationField model synced successfully'))
         
-

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/migrations/0001_initial.py

@@ -325,7 +325,7 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'Access Control Policies',
                 'db_table': 'bloomerp_access_control_policy',
             },
-            bases=(bloomerp.models.mixins.SkipApiCreationMixin, models.Model),
+            bases=(models.Model,),
         ),
         migrations.CreateModel(
             name='RowPolicyRule',

bloomerp-1.0.0.dev19/bloomerp/migrations/0024_alter_bookmark_object_id_alter_documenttemplate_id_and_more.py

@@ -0,0 +1,68 @@
+# Generated by Django 5.1.1 on 2026-04-17 20:39
+
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bloomerp", "0023_remove_tileonworkspace_tile_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="bookmark",
+            name="object_id",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="documenttemplate",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+        migrations.AlterField(
+            model_name="documenttemplatefreevariable",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+        migrations.AlterField(
+            model_name="documenttemplateheader",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+        migrations.AlterField(
+            model_name="documenttemplatestyling",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+        migrations.AlterField(
+            model_name="sqlquery",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tile",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+        migrations.AlterField(
+            model_name="todo",
+            name="id",
+            field=models.UUIDField(
+                default=uuid.uuid4, editable=False, primary_key=True, serialize=False
+            ),
+        ),
+    ]

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/access_control/policy.py

@@ -6,17 +6,17 @@ from django.conf import settings
 
 from bloomerp.models.access_control import RowPolicy
 from bloomerp.models.access_control.field_policy import FieldPolicy
-from bloomerp.models.mixins import TimestampedModelMixin, UserStampedModelMixin, SkipApiCreationMixin
+from bloomerp.models.mixins import TimestampModelMixin
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import QuerySet
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
 from bloomerp.models.users.user import AbstractBloomerpUser
-from bloomerp.models import mixins
+from bloomerp.models.mixins import absolute_url_model_mixin
 
 class Policy(
-    TimestampedModelMixin,
-    UserStampedModelMixin,
-    SkipApiCreationMixin,
-    mixins.AbsoluteUrlModelMixin,
+    TimestampModelMixin,
+    UserStampModelMixin,
+    absolute_url_model_mixin.AbsoluteUrlModelMixin,
     models.Model):
     """
     Represents an access control policy, which combines row-level and field-level policies.

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/access_control/row_policy.py

@@ -5,9 +5,9 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from bloomerp.models import mixins
+from bloomerp.models.mixins import absolute_url_model_mixin
 
-class RowPolicy(mixins.AbsoluteUrlModelMixin, models.Model):
+class RowPolicy(absolute_url_model_mixin.AbsoluteUrlModelMixin, models.Model):
     """
     A policy that limits which rows (records) are visible/mutable for a subject.
     """

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/access_control/row_policy_rule.py

@@ -6,7 +6,7 @@ from django.contrib.auth.models import Permission
 from django.core.exceptions import ValidationError
 from django.contrib.contenttypes.models import ContentType
 from bloomerp.models import ApplicationField
-from bloomerp.models.mixins import AbsoluteUrlModelMixin
+from bloomerp.models.mixins.absolute_url_model_mixin import AbsoluteUrlModelMixin
 
 class RowPolicyRule(AbsoluteUrlModelMixin, models.Model):
     """

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/automation/workflow.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 from django.db import models
-from bloomerp.models.mixins import UserStampedModelMixin
-from bloomerp.models.mixins import TimestampedModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
+from bloomerp.models.mixins import TimestampModelMixin
 from django.utils.translation import gettext_lazy as _
 from bloomerp.automation.defintion import WorkflowNodeType
 
@@ -10,8 +10,8 @@ if TYPE_CHECKING:
     from bloomerp.models.automation.workflow_edge import WorkflowEdge
 
 class Workflow(
-    UserStampedModelMixin,
-    TimestampedModelMixin,
+    UserStampModelMixin,
+    TimestampModelMixin,
     models.Model):
     """
     A workflow is a model for automation.

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/automation/workflow_node.py

@@ -4,15 +4,15 @@ from bloomerp.automation.defintion import WorkflowNodeType
 from bloomerp.automation.defintion import NodeTypeDefinition
 from bloomerp.automation.defintion import NodeSubTypeDefinition
 from bloomerp.automation.base_executor import NodeExecutionError
-from bloomerp.models.mixins import UserStampedModelMixin
-from bloomerp.models.mixins import TimestampedModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
+from bloomerp.models.mixins import TimestampModelMixin
 from django.utils.translation import gettext_lazy as _
 from django.db.models import QuerySet
 from django.core.exceptions import ValidationError
 
 class WorkflowNode(
-    UserStampedModelMixin,
-    TimestampedModelMixin,
+    UserStampModelMixin,
+    TimestampModelMixin,
     models.Model):
     
     class Meta:

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/automation/workflow_run.py

@@ -1,12 +1,12 @@
 from django.db import models
 from bloomerp.models.automation import workflow
-from bloomerp.models.mixins import UserStampedModelMixin
-from bloomerp.models.mixins import TimestampedModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
+from bloomerp.models.mixins import TimestampModelMixin
 from django.utils.translation import gettext_lazy as _
 
 class WorkflowRun(
-    UserStampedModelMixin,
-    TimestampedModelMixin,
+    UserStampModelMixin,
+    TimestampModelMixin,
     models.Model):
     
     class Meta:

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/base_bloomerp_model.py

@@ -2,7 +2,12 @@ from django.db import models
 from django.contrib.contenttypes.fields import GenericRelation
 from pydantic import BaseModel, Field
 from typing import Optional
-from bloomerp.models import mixins
+from bloomerp.models.mixins.absolute_url_model_mixin import AbsoluteUrlModelMixin
+from bloomerp.models.mixins.avatar_model_mixin import AvatarModelMixin
+from bloomerp.models.mixins.string_search_model_mixin import StringSearchModelMixin
+from bloomerp.models.mixins.timestamp_model_mixin import TimestampModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
+from bloomerp.models.mixins.uuid_model_mixin import UuidModelMixin
 
 
 class LayoutItem(BaseModel):
@@ -19,13 +24,13 @@ class LayoutRow(BaseModel):
 class FieldLayout(BaseModel):
     rows: list[LayoutRow] = Field(default_factory=list)
 
-
 class BloomerpModel(
-    mixins.TimestampedModelMixin,
-    mixins.StringSearchModelMixin,
-    mixins.UserStampedModelMixin,
-    mixins.AbsoluteUrlModelMixin,
-    mixins.AvatarModelMixin,
+    UuidModelMixin,
+    TimestampModelMixin,
+    StringSearchModelMixin,
+    UserStampModelMixin,
+    AbsoluteUrlModelMixin,
+    AvatarModelMixin,
     models.Model,
 ):
     class Meta:
@@ -40,7 +45,6 @@ class BloomerpModel(
             'bulk_add', 
             'export'
         )
-    
     files = GenericRelation("bloomerp.File")
     comments = GenericRelation("bloomerp.Comment")
 

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/communication/comment.py

@@ -1,13 +1,13 @@
-from bloomerp.models import TimestampedModelMixin
-from bloomerp.models import UserStampedModelMixin
+from bloomerp.models import TimestampModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
 from bloomerp.models import BloomerpModel
 from django.db import models
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 
 class Comment(
-    TimestampedModelMixin,
-    UserStampedModelMixin,
+    TimestampModelMixin,
+    UserStampModelMixin,
     models.Model,
 ):
     class Meta(BloomerpModel.Meta):

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/files/file.py

@@ -3,15 +3,17 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
 import os
 import uuid
-from bloomerp.models import mixins
 from bloomerp.models.base_bloomerp_model import BloomerpModel
+from bloomerp.models.mixins.string_search_model_mixin import StringSearchModelMixin
+from bloomerp.models.mixins.timestamp_model_mixin import TimestampModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
 from django.db.models.query import QuerySet
 from bloomerp.services.file_services import ensure_folder_hierarchy_for_object
 
 class File(
-    mixins.TimestampedModelMixin, 
-    mixins.StringSearchModelMixin,
-    mixins.UserStampedModelMixin,
+    TimestampModelMixin,
+    StringSearchModelMixin,
+    UserStampModelMixin,
     models.Model,
 ):
     class Meta(BloomerpModel.Meta):

{bloomerp-1.0.0.dev17 → bloomerp-1.0.0.dev19}/bloomerp/models/files/file_folder.py

@@ -2,15 +2,18 @@ from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db import models
-from bloomerp.models import mixins
 from bloomerp.models.base_bloomerp_model import BloomerpModel
+from bloomerp.models.mixins.absolute_url_model_mixin import AbsoluteUrlModelMixin
+from bloomerp.models.mixins.string_search_model_mixin import StringSearchModelMixin
+from bloomerp.models.mixins.timestamp_model_mixin import TimestampModelMixin
+from bloomerp.models.mixins.user_stamp_model_mixin import UserStampModelMixin
 
 
 class FileFolder(
-    mixins.TimestampedModelMixin,
-    mixins.UserStampedModelMixin,
-    mixins.AbsoluteUrlModelMixin,
-    mixins.StringSearchModelMixin,
+    TimestampModelMixin,
+    UserStampModelMixin,
+    AbsoluteUrlModelMixin,
+    StringSearchModelMixin,
     models.Model,
 ):
     class Meta(BloomerpModel.Meta):

bloomerp-1.0.0.dev19/bloomerp/models/mixins/__init__.py

@@ -0,0 +1,17 @@
+from .absolute_url_model_mixin import AbsoluteUrlModelMixin
+from .avatar_model_mixin import AvatarModelMixin
+from .content_layout_model_mixin import ContentLayoutModelMixin
+from .uuid_model_mixin import UuidModelMixin
+from .string_search_model_mixin import StringSearchModelMixin
+from .timestamp_model_mixin import TimestampModelMixin
+from .user_stamp_model_mixin import UserStampModelMixin
+
+__all__ = [
+	"AbsoluteUrlModelMixin",
+	"AvatarModelMixin",
+	"ContentLayoutModelMixin",
+	"UuidModelMixin",
+	"StringSearchModelMixin",
+	"TimestampModelMixin",
+	"UserStampModelMixin",
+]

bloomerp-1.0.0.dev19/bloomerp/models/mixins/absolute_url_model_mixin.py

@@ -0,0 +1,16 @@
+from django.db import models
+from django.urls import reverse
+
+
+class AbsoluteUrlModelMixin(models.Model):
+    """
+    A mixin for models that need to have an absolute URL.
+    """
+    class Meta:
+        abstract = True
+
+    def get_absolute_url(self):
+        """
+        Returns the absolute URL of the model instance.
+        """
+        return reverse(f'{self._meta.verbose_name_plural.replace(' ','_')}_detail_overview'.lower(), kwargs={'pk': self.pk})

bloomerp-1.0.0.dev19/bloomerp/models/mixins/avatar_model_mixin.py

@@ -0,0 +1,10 @@
+from django.db import models
+
+
+class AvatarModelMixin(models.Model):
+    """
+    A mixin for models that need to have an avatar.
+    """
+    class Meta:
+        abstract = True
+    avatar = models.ImageField(upload_to='avatars/', null=True, blank=True)