matrx-orm 1.2.2__tar.gz → 1.2.4__tar.gz

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrx-orm
-Version: 1.2.2
+Version: 1.2.4
 Summary: Add your description here
 Author-email: jatin.b.rx3@gmail.com
 Requires-Python: >=3.10

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "1.2.2"
+version = "1.2.4"
 description = "Add your description here"
 readme = "README.md"
 authors = [

matrx_orm-1.2.4/release.sh

@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PYPROJECT="pyproject.toml"
+REMOTE="origin"
+BRANCH="main"
+
+# ── Colors ──────────────────────────────────────────────────────────────────
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+CYAN='\033[0;36m'
+NC='\033[0m'
+
+info()  { echo -e "${CYAN}[INFO]${NC} $*"; }
+ok()    { echo -e "${GREEN}[OK]${NC}   $*"; }
+warn()  { echo -e "${YELLOW}[WARN]${NC} $*"; }
+fail()  { echo -e "${RED}[FAIL]${NC} $*"; exit 1; }
+
+# ── Pre-flight checks ──────────────────────────────────────────────────────
+
+# Must be in the repo root (where pyproject.toml lives)
+[[ -f "$PYPROJECT" ]] || fail "$PYPROJECT not found. Run this from the repo root."
+
+# Must be on the main branch
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+[[ "$CURRENT_BRANCH" == "$BRANCH" ]] || fail "Not on $BRANCH branch (on $CURRENT_BRANCH). Switch first."
+
+# Must have a clean working tree (user should have already committed)
+if [[ -n "$(git diff --cached --name-only)" ]]; then
+    fail "You have staged but uncommitted changes. Commit first, then run this script."
+fi
+
+if [[ -n "$(git diff --name-only)" ]]; then
+    warn "You have unstaged changes in tracked files. They will NOT be included."
+    echo -e "       Untracked files are always ignored.\n"
+fi
+
+# Must have at least one commit ahead of remote (the user's commit)
+LOCAL_HEAD=$(git rev-parse HEAD)
+REMOTE_HEAD=$(git rev-parse "$REMOTE/$BRANCH" 2>/dev/null || echo "none")
+if [[ "$LOCAL_HEAD" == "$REMOTE_HEAD" ]]; then
+    fail "No new commits to release. Commit your changes first, then run this script."
+fi
+
+# ── Read & bump version ────────────────────────────────────────────────────
+
+CURRENT_VERSION=$(grep '^version = ' "$PYPROJECT" | sed 's/version = "\(.*\)"/\1/')
+[[ -n "$CURRENT_VERSION" ]] || fail "Could not read version from $PYPROJECT"
+
+IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
+NEW_PATCH=$((PATCH + 1))
+NEW_VERSION="${MAJOR}.${MINOR}.${NEW_PATCH}"
+NEW_TAG="v${NEW_VERSION}"
+
+info "Current version: $CURRENT_VERSION"
+info "New version:     $NEW_VERSION"
+info "Tag:             $NEW_TAG"
+
+# Check tag doesn't already exist
+if git rev-parse "$NEW_TAG" &>/dev/null; then
+    fail "Tag $NEW_TAG already exists. Manually resolve the version."
+fi
+
+echo ""
+
+# ── Update pyproject.toml and amend the commit ─────────────────────────────
+
+info "Updating $PYPROJECT to version $NEW_VERSION..."
+sed -i "s/^version = \"$CURRENT_VERSION\"/version = \"$NEW_VERSION\"/" "$PYPROJECT"
+ok "Version updated in $PYPROJECT"
+
+info "Amending last commit to include version bump..."
+git add "$PYPROJECT"
+git commit --amend --no-edit --quiet
+ok "Commit amended"
+
+# ── Push commit ─────────────────────────────────────────────────────────────
+
+info "Pushing to $REMOTE/$BRANCH..."
+git push "$REMOTE" "$BRANCH"
+ok "Pushed to $REMOTE/$BRANCH"
+
+# ── Tag and push tag ───────────────────────────────────────────────────────
+
+info "Creating tag $NEW_TAG..."
+git tag "$NEW_TAG"
+ok "Tag created"
+
+info "Pushing tag $NEW_TAG..."
+git push "$REMOTE" "$NEW_TAG"
+ok "Tag pushed"
+
+# ── Done ────────────────────────────────────────────────────────────────────
+
+echo ""
+echo -e "${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo -e "${GREEN}  Released matrx-orm $NEW_VERSION${NC}"
+echo -e "${GREEN}  GitHub Actions will now build and publish to PyPI.${NC}"
+echo -e "${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+echo ""
+echo -e "  Monitor: ${CYAN}https://github.com/armanisadeghi/matrx-orm/actions${NC}"
+echo -e "  Update:  ${CYAN}uv add matrx-orm@${NEW_VERSION}${NC}"
+echo ""

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/src/matrx_orm/core/config.py

@@ -170,9 +170,11 @@ def get_code_config(db_project):
         "temp_path": "models.py",
         "root": ADMIN_PYTHON_ROOT,
         "file_location": f"# File: database/{usable_name}/models.py",
+        # Note: import_lines are dynamically replaced by generate_models() in schema.py
+        # based on the actual field types used. This is a fallback default only.
         "import_lines": [
             "import database_registry",
-            "from matrx_orm import CharField, EnumField, DateField, TextField, IntegerField, FloatField, BooleanField, DateTimeField, UUIDField, JSONField, DecimalField, BigIntegerField, SmallIntegerField, JSONBField, UUIDArrayField, JSONBArrayField, IPAddressField, ForeignKey, Model, model_registry, BaseDTO, BaseManager",
+            "from matrx_orm import Model, model_registry, BaseDTO, BaseManager",
             "from enum import Enum",
             "from dataclasses import dataclass"
         ],

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/src/matrx_orm/schema_builder/individual_managers/columns.py

@@ -791,6 +791,14 @@ class Column:
                 "blank": value.split("'")[1].strip(),  # Extract timestamp with timezone
                 "generator": "formatTimestamptz()",
             },
+            "::time without time zone": lambda value: {
+                "blank": value.split("'")[1].strip(),  # Extract time value
+                "generator": "formatTime()",
+            },
+            "::time with time zone": lambda value: {
+                "blank": value.split("'")[1].strip(),  # Extract time with timezone value
+                "generator": "formatTime()",
+            },
             "::uuid": lambda uuid_value: {
                 "blank": uuid_value.split("'")[1].strip() if "'" in uuid_value else uuid_value.strip(),
                 "generator": "",
@@ -884,6 +892,10 @@ class Column:
             elif value.startswith("ARRAY[]::") and value.endswith("[]"):
                 return {"blank": "[]", "generator": ""}
 
+            # Handle non-empty ARRAY[...] syntax: ARRAY['react'::text, 'lucide-react'::text, ...]
+            elif value.startswith("ARRAY["):
+                return {"blank": "[]", "generator": ""}
+
             # Handle simple numeric defaults (no quotes, no casting)
             # This includes integers, decimals, negative numbers, scientific notation
             elif value.isdigit() or (value.startswith("-") and value[1:].replace(".", "", 1).isdigit()):
@@ -942,6 +954,12 @@ class Column:
                 vcprint(data=value, color="red")
                 return callable_outcomes["::timestamp with time zone"](value)
 
+            if value.endswith("::time without time zone"):
+                return callable_outcomes["::time without time zone"](value)
+
+            if value.endswith("::time with time zone"):
+                return callable_outcomes["::time with time zone"](value)
+
             if value.endswith("::uuid"):
                 uuid_value = value.split("::")[0].strip("'")  # Extract UUID without validation
                 return callable_outcomes["::uuid"](uuid_value)

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/src/matrx_orm/schema_builder/individual_managers/common.py

@@ -10,7 +10,7 @@ schema_builder_save_direct = True
 
 
 DEBUG_SETTINGS = {
-    "tables": ["wc_impairment_definition"],
-    "columns": ["name"],
-    "base_type": [""],
+    "tables": [],
+    "columns": [],
+    "base_type": [],
 }

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/src/matrx_orm/schema_builder/individual_managers/schema.py

@@ -652,10 +652,19 @@ class Schema:
                 remaining_tables.remove(table_name)
 
         py_structure = [self.get_string_user_model()]
+        all_field_types = {"UUIDField", "CharField", "Model"}
+
         for table_name in sorted_tables:
             table = self.tables[table_name]
             py_table_entry = table.to_python_model()
             py_structure.append(py_table_entry)
+            all_field_types.update(table.unique_field_types)
+
+        has_enums = any(
+            column.has_enum_labels
+            for table in self.tables.values()
+            for column in table.columns
+        )
 
         py_manager_structure = []
         py_auto_config_structure = []
@@ -690,8 +699,19 @@ class Schema:
             print("python_models", get_code_config(self.database_project)["python_models"])
             print("-----------------------------\n")
 
-        self.code_handler.generate_and_save_code_from_object(get_code_config(self.database_project)["python_models"],
-                                                             main_code, additional_code)
+        models_config = get_code_config(self.database_project)["python_models"]
+        sorted_field_types = sorted(all_field_types)
+        field_imports = ", ".join(sorted_field_types)
+        dynamic_import_lines = [
+            "import database_registry",
+            f"from matrx_orm import {field_imports}, model_registry, BaseDTO, BaseManager",
+        ]
+        if has_enums:
+            dynamic_import_lines.append("from enum import Enum")
+        dynamic_import_lines.append("from dataclasses import dataclass")
+        models_config["import_lines"] = dynamic_import_lines
+
+        self.code_handler.generate_and_save_code_from_object(models_config, main_code, additional_code)
 
         
         py_auto_config_code = "\n".join(py_auto_config_structure)

{matrx_orm-1.2.2 → matrx_orm-1.2.4}/src/matrx_orm/schema_builder/individual_managers/tables.py

@@ -1021,7 +1021,13 @@ class Table:
         for column in self.columns:
             py_field = column.to_python_model_field()
             py_fields.append(py_field)
-            self.unique_field_types.add(column.python_field_type)
+
+            if column.foreign_key_reference:
+                self.unique_field_types.add("ForeignKey")
+            elif column.has_enum_labels:
+                self.unique_field_types.add("EnumField")
+            else:
+                self.unique_field_types.add(column.python_field_type)
 
             if column.has_enum_labels:
                 py_enum_entry = column.set_python_enum_entry()

matrx_orm-1.2.4/test_model_cls_refactor.py

@@ -0,0 +1,91 @@
+"""
+Test script to verify the model_cls refactoring works correctly.
+
+This test creates a simple model with a field named 'model' to ensure
+there are no conflicts with the internal model_cls parameter.
+"""
+
+from matrx_orm import Model, Field
+
+
+class TestModel(Model):
+    """Test model with a field named 'model' to verify no conflicts."""
+    
+    _table_name = "test_models"
+    _database = "test"
+    
+    id = Field(primary_key=True)
+    name = Field()
+    model = Field()  # This should now work without conflicts!
+    description = Field()
+
+
+def test_model_definition():
+    """Test that the model can be defined with a 'model' field."""
+    print("✓ Model definition successful")
+    print(f"  Table name: {TestModel._table_name}")
+    print(f"  Fields: {list(TestModel._fields.keys())}")
+    assert 'model' in TestModel._fields, "Field 'model' should be in _fields"
+    print("✓ Field 'model' is properly defined")
+
+
+def test_model_instantiation():
+    """Test that we can create instances with the 'model' field."""
+    instance = TestModel(
+        id=1,
+        name="Test Item",
+        model="GPT-4",  # Using 'model' as a field
+        description="Test description"
+    )
+    print("✓ Model instantiation successful")
+    print(f"  Instance.model: {instance.model}")
+    assert instance.model == "GPT-4", "Field 'model' should store the value"
+    print("✓ Field 'model' stores and retrieves values correctly")
+
+
+def test_reserved_names_doc():
+    """Verify the RESERVED_NAMES.md file exists."""
+    import os
+    doc_path = "/home/arman/projects/matrx-orm/RESERVED_NAMES.md"
+    assert os.path.exists(doc_path), "RESERVED_NAMES.md should exist"
+    print("✓ RESERVED_NAMES.md documentation exists")
+
+
+if __name__ == "__main__":
+    print("=" * 60)
+    print("Testing model_cls Refactoring")
+    print("=" * 60)
+    print()
+    
+    try:
+        test_model_definition()
+        print()
+        test_model_instantiation()
+        print()
+        test_reserved_names_doc()
+        print()
+        print("=" * 60)
+        print("✅ ALL TESTS PASSED!")
+        print("=" * 60)
+        print()
+        print("Summary:")
+        print("- Models can now have fields named 'model' without conflicts")
+        print("- Internal operations use 'model_cls' parameter")
+        print("- RESERVED_NAMES.md documents all reserved names")
+        print()
+    except AssertionError as e:
+        print()
+        print("=" * 60)
+        print("❌ TEST FAILED!")
+        print("=" * 60)
+        print(f"Error: {e}")
+        exit(1)
+    except Exception as e:
+        print()
+        print("=" * 60)
+        print("❌ UNEXPECTED ERROR!")
+        print("=" * 60)
+        print(f"Error: {e}")
+        import traceback
+        traceback.print_exc()
+        exit(1)