Bloomerp 1.0.0.dev33__tar.gz → 1.0.0.dev35__tar.gz

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/Bloomerp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev33
+Version: 1.0.0.dev35
 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.dev33 → bloomerp-1.0.0.dev35}/Bloomerp.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ bloomerp/cli.py
 bloomerp/consumers.py
 bloomerp/context_processors.py
 bloomerp/field_types.py
-bloomerp/langchain_tools.py
 bloomerp/middleware.py
 bloomerp/router.py
 bloomerp/routing.py
@@ -165,6 +164,7 @@ bloomerp/services/create_view_services.py
 bloomerp/services/detail_view_services.py
 bloomerp/services/document_services.py
 bloomerp/services/file_services.py
+bloomerp/services/notification_services.py
 bloomerp/services/object_services.py
 bloomerp/services/permission_services.py
 bloomerp/services/sectioned_layout_services.py

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Bloomerp
-Version: 1.0.0.dev33
+Version: 1.0.0.dev35
 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.dev33 → bloomerp-1.0.0.dev35}/bloomerp/routing.py

@@ -2,6 +2,7 @@ from django.urls import re_path
 
 from . import consumers
 
+# TODO: Refactor this
 websocket_urlpatterns = [
     re_path(r'^ws/notifications/$', consumers.NotificationsConsumer.as_asgi()),
 ]

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/sdk/base.py

@@ -14,6 +14,12 @@ from bloomerp.models.definition import BloomerpModelConfig
 from bloomerp.utils.models import model_name_plural_underline
 
 
+@dataclass(frozen=True)
+class SdkFieldChoiceDefinition:
+    value: str | int | float | bool | None
+    label: str
+
+
 @dataclass(frozen=True)
 class SdkFieldDefinition:
     name: str
@@ -28,6 +34,7 @@ class SdkFieldDefinition:
     ts_type: str
     js_doc_type: str
     python_type: str
+    choices: list[SdkFieldChoiceDefinition] | None
 
 
 @dataclass(frozen=True)
@@ -162,6 +169,7 @@ class BaseSdkGenerator(ABC):
                     ts_type=self.get_ts_type_for_field(model_field),
                     js_doc_type=self.get_js_doc_type_for_field(model_field),
                     python_type=self.get_python_type_for_field(model_field),
+                    choices=self.get_field_choices(model_field),
                 )
             )
 
@@ -191,6 +199,28 @@ class BaseSdkGenerator(ABC):
             return None
         return related_model.__name__
 
+    def get_field_choices(self, field: models.Field) -> list[SdkFieldChoiceDefinition] | None:
+        if not getattr(field, "choices", None):
+            return None
+
+        resolved_choices = getattr(field, "flatchoices", None) or field.choices
+        choices: list[SdkFieldChoiceDefinition] = []
+        for value, label in resolved_choices:
+            normalized_value = value
+            if isinstance(normalized_value, str | int | float | bool) or normalized_value is None:
+                pass
+            else:
+                normalized_value = str(normalized_value)
+
+            choices.append(
+                SdkFieldChoiceDefinition(
+                    value=normalized_value,
+                    label=str(label),
+                )
+            )
+
+        return choices or None
+
     def get_ts_type_for_field(self, field: models.Field) -> str:
         if isinstance(field, (models.ForeignKey, models.OneToOneField)):
             related_pk_type = self.get_ts_type_for_field(field.related_model._meta.pk)
@@ -282,6 +312,7 @@ class BaseSdkGenerator(ABC):
             "editable": payload["editable"],
             "requiredOnCreate": payload["required_on_create"],
             "tsType": payload["ts_type"],
+            "choices": payload["choices"],
         }
 
     def build_public_access_metadata(self, config: BloomerpModelConfig | None) -> dict:

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/sdk/javascript.py

@@ -63,6 +63,38 @@ for (const item of page.results) {{
   console.log(item.{filter_key});
 }}
 ```
+
+## Inspect Field Options
+
+```js
+const statusChoices = sdk.metadata.models.todos?.fields.status.choices || [];
+
+for (const option of statusChoices) {{
+  console.log(option.value, option.label);
+}}
+```
+
+## Handle Validation Errors
+
+```js
+import BloomerpSdk, {{ BloomerpHttpError }} from "./{self.filename}";
+
+const sdk = new BloomerpSdk({{
+  baseUrl: "https://example.com",
+}});
+
+try {{
+  await sdk.{client_name}.create({{
+    // invalid payload
+  }});
+}} catch (error) {{
+  if (error instanceof BloomerpHttpError && error.status === 400) {{
+    console.log(error.body);
+  }} else {{
+    throw error;
+  }}
+}}
+```
 """
 
     def render_prelude(self) -> str:
@@ -108,17 +140,57 @@ for (const item of page.results) {{
  *   credentials?: RequestCredentials,
  *   csrf?: SessionCsrfConfig
  * }} BloomerpAuth
+ * @typedef {{ value: string | number | boolean | null, label: string }} BloomerpFieldChoice
+ * @typedef {{
+ *   name: string,
+ *   title: string,
+ *   fieldType: string,
+ *   dbFieldType: string | null,
+ *   nullable: boolean,
+ *   many: boolean,
+ *   relatedModel: string | null,
+ *   editable: boolean,
+ *   requiredOnCreate: boolean,
+ *   tsType: string,
+ *   choices: BloomerpFieldChoice[] | null
+ * }} BloomerpFieldMetadata
  */
 
 export class BloomerpHttpError extends Error {{
   constructor(response, body = undefined) {{
-    super(`Bloomerp request failed with status ${{response.status}}: ${{response.statusText}}`);
+    super(BloomerpHttpError.buildMessage(response, body));
     this.name = "BloomerpHttpError";
     this.status = response.status;
     this.statusText = response.statusText;
     this.body = body;
     this.headers = response.headers;
   }}
+
+  static buildMessage(response, body = undefined) {{
+    if (typeof body === "string" && body.trim()) {{
+      return body;
+    }}
+
+    if (body && typeof body === "object") {{
+      const payload = body;
+
+      if (typeof payload.detail === "string" && payload.detail.trim()) {{
+        return payload.detail;
+      }}
+
+      const firstEntry = Object.values(payload).find(
+        (value) => value !== undefined && value !== null,
+      );
+      if (typeof firstEntry === "string" && firstEntry.trim()) {{
+        return firstEntry;
+      }}
+      if (Array.isArray(firstEntry) && typeof firstEntry[0] === "string") {{
+        return firstEntry[0];
+      }}
+    }}
+
+    return `Bloomerp request failed with status ${{response.status}}: ${{response.statusText}}`;
+  }}
 }}
 
 export class BloomerpHttpClient {{

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/sdk/python.py

@@ -72,6 +72,32 @@ page = sdk.{client_name}.list({{
 for item in page["results"]:
     print(item["{filter_key}"])
 ```
+
+## Inspect Field Options
+
+```python
+status_field = sdk.metadata["models"].get("todos", {{}}).get("fields", {{}}).get("status")
+for option in (status_field.choices if status_field else []):
+    print(option["value"], option["label"])
+```
+
+## Handle Validation Errors
+
+```python
+from {self.filename.removesuffix('.py')} import BloomerpHttpError, BloomerpSdk
+
+sdk = BloomerpSdk(base_url="https://example.com")
+
+try:
+    sdk.{client_name}.create({{
+        # invalid payload
+    }})
+except BloomerpHttpError as error:
+    if error.status == 400 and isinstance(error.body, dict):
+        print(error.body)
+    else:
+        raise
+```
 """
 
     def render_prelude(self) -> str:
@@ -158,6 +184,7 @@ class BloomerpFieldMetadata:
     editable: bool
     required_on_create: bool
     ts_type: str
+    choices: list[dict[str, Any]] | None
 
 
 @dataclass(frozen=True)
@@ -518,4 +545,5 @@ bloomerp_auth_strategy_types: tuple[str, ...] = tuple({auth_strategy_types})
             "editable": metadata["editable"],
             "required_on_create": metadata["requiredOnCreate"],
             "ts_type": metadata["tsType"],
+            "choices": metadata["choices"],
         }

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/sdk/typescript.py

@@ -78,12 +78,46 @@ const page = await sdk.{client_name}.list({{
 const results = page.results;
 ```
 
+## Inspect Field Options
+
+```ts
+const statusChoices = sdk.metadata.models.todos?.fields.status.choices ?? [];
+
+for (const option of statusChoices) {{
+  console.log(option.value, option.label);
+}}
+```
+
+## Handle Validation Errors
+
+```ts
+import BloomerpSdk, {{ BloomerpHttpError }} from "./{self.filename}";
+
+const sdk = new BloomerpSdk({{
+  baseUrl: "https://example.com",
+}});
+
+try {{
+  await sdk.{client_name}.create({{
+    // invalid payload
+  }});
+}} catch (error) {{
+  if (error instanceof BloomerpHttpError && error.status === 400) {{
+    const fieldErrors = error.body as Record<string, string[]>;
+    console.log(fieldErrors);
+  }} else {{
+    throw error;
+  }}
+}}
+```
+
 ## Notes
 
 - `sdk.auth.*` targets Bloomerp's built-in `/api/auth/*` endpoints.
 - `list()` always returns a paginated shape with `results`, `count`, `next`, and `previous`.
 - Per-request options flow through to `fetch`, including `cache`, `credentials`, `headers`, `signal`, and framework-specific fetch options.
 - Structured failures throw `BloomerpHttpError`.
+- Choice fields expose `{{ value, label }}` metadata under `sdk.metadata.models.<model>.fields.<field>.choices`.
 - Example model shown above: `{model_name}`.
 """
 
@@ -126,6 +160,11 @@ export interface BloomerpAuthLoginPayload {{
   [key: string]: unknown;
 }}
 
+export interface BloomerpFieldChoiceMetadata {{
+  value: string | number | boolean | null;
+  label: string;
+}}
+
 export interface BloomerpFieldMetadata {{
   name: string;
   title: string;
@@ -137,6 +176,7 @@ export interface BloomerpFieldMetadata {{
   editable: boolean;
   requiredOnCreate: boolean;
   tsType: string;
+  choices: BloomerpFieldChoiceMetadata[] | null;
 }}
 
 export interface BloomerpModelPublicAccessMetadata {{
@@ -199,13 +239,39 @@ export class BloomerpHttpError<TBody = unknown> extends Error {{
   public readonly headers: Headers;
 
   constructor(response: Response, body?: TBody) {{
-    super(`Bloomerp request failed with status ${{response.status}}: ${{response.statusText}}`);
+    super(BloomerpHttpError.buildMessage(response, body));
     this.name = "BloomerpHttpError";
     this.status = response.status;
     this.statusText = response.statusText;
     this.body = body;
     this.headers = response.headers;
   }}
+
+  private static buildMessage<TBody>(response: Response, body?: TBody) {{
+    if (typeof body === "string" && body.trim()) {{
+      return body;
+    }}
+
+    if (body && typeof body === "object") {{
+      const payload = body as Record<string, unknown>;
+
+      if (typeof payload.detail === "string" && payload.detail.trim()) {{
+        return payload.detail;
+      }}
+
+      const firstEntry = Object.values(payload).find(
+        (value) => value !== undefined && value !== null,
+      );
+      if (typeof firstEntry === "string" && firstEntry.trim()) {{
+        return firstEntry;
+      }}
+      if (Array.isArray(firstEntry) && typeof firstEntry[0] === "string") {{
+        return firstEntry[0];
+      }}
+    }}
+
+    return `Bloomerp request failed with status ${{response.status}}: ${{response.statusText}}`;
+  }}
 }}
 
 export class BloomerpHttpClient {{

bloomerp-1.0.0.dev35/bloomerp/services/notification_services.py

@@ -0,0 +1,5 @@
+# Requirements
+# - broadcast a notification to a user
+# - notification should be stored in the database
+# - ideally, we want people that use bloomerp as a backend (i.e to build a SaaS) to use the same out-of-the box notification system as users who use bloomerp as an internal tool
+

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/views/access_control/manage_permissions.py

@@ -268,7 +268,7 @@ def pcs_policy_details(request: HttpRequest, view, orchestrator: BaseStateOrches
     name="Create Policy for {model}",
     description="Create an access control policies for {model}",
 )
-class ManageAccessControlForModelView(BaseBloomerpView, WizardMixin, TemplateView):
+class ManageAccessControlForModelView(WizardMixin, BaseBloomerpView, TemplateView):
     template_name = "base_wizard.html"
     model: type[Model] = None
 

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/views/core/bulk_upload.py

@@ -204,7 +204,7 @@ def ctx_confirm_step(request: HttpRequest, view:"BloomerpBulkUploadView", orches
     route_type="model",
     exclude_models=[File],
 )
-class BloomerpBulkUploadView(BaseBloomerpView, WizardMixin, TemplateView):
+class BloomerpBulkUploadView(WizardMixin, BaseBloomerpView, TemplateView):
     model = None
     module = None
     state_orchestrator_cls = BaseStateOrchestrator

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/views/mixins/wizard_mixin.py

@@ -292,6 +292,7 @@ class WizardMixin:
         return bool(state)
 
     def get_htmx_include_addendum(self) -> bool:
+        
         htmx_request = self.request.htmx
         if htmx_request:
             if htmx_request.target == "main-content":

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/bloomerp/views/workspace/create_tile.py

@@ -172,7 +172,7 @@ BUILDER_STEP = WizardStep(
     name="Create Tile",
     description="Create a new tile for the workspace",
 )
-class CreateTileView(BaseBloomerpView, WizardMixin, TemplateView):
+class CreateTileView(WizardMixin, BaseBloomerpView, TemplateView):
     template_name = "base_wizard.html"
     session_key = CREATE_TILE_SESSION_KEY
     

{bloomerp-1.0.0.dev33 → bloomerp-1.0.0.dev35}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Bloomerp"
-version = "1.0.0.dev33"
+version = "1.0.0.dev35"
 description = "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."
 readme = "README.md"
 requires-python = ">=3.12"

bloomerp-1.0.0.dev33/bloomerp/langchain_tools.py

@@ -1,77 +0,0 @@
-from langchain_core.tools import tool, StructuredTool, BaseTool
-from bloomerp.utils.sql import SqlQueryExecutor
-from bloomerp.models.application_field import ApplicationField
-from bloomerp.models.users.user import AbstractBloomerpUser
-from bloomerp.models.auth import Link
-    
-
-class BaseBloomerpTool(BaseTool):
-    requires_user : bool = False # Tool that requires user id
-    user : AbstractBloomerpUser = None
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.user = kwargs.get('user', None)
-
-    
-
-
-class GetDatabaseTablesTool(BaseBloomerpTool):
-    description : str = '''
-                    Function that returns a dictionary of tables and their columns in a database
-                    Can be used to get to know the structure of the database for further querying
-                    Function should only be called once during every conversation.
-                    Tables that are not accessible to the user will not be returned.
-                    '''
-    name : str = "get_accessible_database_tables"
-
-
-    def _run(self) -> list[tuple[str, list[str]]]:
-        tables = ApplicationField.get_db_tables_and_columns(self.user)
-        if not tables:
-            return "User does not have access to any tables"
-        else:
-            return tables
-    
-
-class PerformSqlQueryTool(BaseBloomerpTool):
-    description : str = '''Function that performs an SQL query and returns the result.
-                    Can only be used to perform SELECT queries.'''
-    name : str = "perform_sql_query"
-
-    def _run(self, query: str) -> list[list[str]]:
-        sql_executor = SqlQueryExecutor()
-        try:
-            result = sql_executor.execute_raw(query)
-            return result
-        except Exception as e:
-            return [[str(e)]]
-    
-class GetApplicationRoutesTool(BaseBloomerpTool):
-    description : str = '''Function that returns the list of application routes that are accessible to the user.
-    Args:
-        key_word : list[str] - A list of keywords to filter the routes
-    '''
-    name : str = "get_application_routes"
-
-    def _run(self, key_words: list[str]) -> list[str]:
-        links = []
-
-        qs = Link.objects.none()
-        for key_word in key_words:
-            qs = qs | Link.objects.filter(name__icontains=key_word)
-
-        qs = qs.distinct()
-
-        for link in qs:
-            if not link.requires_args():
-                links.append(link.to_absolute_url())
-
-        return links
-            
-
-
-        
-
-
-BLOOMAI_TOOLS = [PerformSqlQueryTool, GetDatabaseTablesTool, GetApplicationRoutesTool]  # List of tools that can be used in the bloomai