chore: code cleanup, ci fixes

Author: mikewolfd

.github/workflows/python-publish.yml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Generate models
         run: |
-          python scripts/generate_models.py
+          python run.py all
 
       - name: Run tests
         run: |
@@ -78,15 +78,21 @@ jobs:
           mkdir -p /tmp/check-sdist
           tar -xf dist/*.tar.gz -C /tmp/check-sdist
           MODEL_COUNT=$(find /tmp/check-sdist -name "*.py" | grep models | wc -l)
+          ENUM_COUNT=$(find /tmp/check-sdist -name "*.py" | grep enums | wc -l)
           echo "Source distribution contains $MODEL_COUNT model files"
-          if [ "$MODEL_COUNT" -lt 900 ]; then
+          echo "Source distribution contains $ENUM_COUNT enum files"
+          if [ "$MODEL_COUNT" -lt 800 ]; then
             echo "ERROR: Not enough model files in source distribution"
             exit 1
           fi
+          if [ "$ENUM_COUNT" -lt 75 ]; then
+            echo "ERROR: Not enough enum files in source distribution"
+            exit 1
+          fi
 
           # Install and verify the wheel
           pip install dist/*.whl
-          python -c "import msgspec_schemaorg.models; count = len(msgspec_schemaorg.models.__all__); print(f'Wheel contains {count} importable models'); assert count > 900, 'Not enough models'"
+          python -c "import msgspec_schemaorg.models; count = len(msgspec_schemaorg.models.__all__); print(f'Wheel contains {count} importable models'); assert count > 800, 'Not enough models'"
 
       - name: Upload distributions
         uses: actions/upload-artifact@v4

.gitignore

@@ -206,4 +206,6 @@ Thumbs.db
 ehthumbs.db
 Desktop.ini
 msgspec_schemaorg/models/**/*.py
-!msgspec_schemaorg/models/**/__*.py
+!msgspec_schemaorg/models/**/__*.py
+msgspec_schemaorg/enums/**/*.py
+!msgspec_schemaorg/enums/**/__*.py

examples/enum_example.py

@@ -6,12 +6,12 @@
 import json
 import msgspec
 import inspect
-from msgspec_schemaorg.enums.intangible import DeliveryMethod, MediaManipulationRatingEnumeration
+from msgspec_schemaorg.enums import DeliveryMethod, MediaManipulationRatingEnumeration
 from msgspec_schemaorg.models import Offer, Person, MediaReview
 
 # Using enums for property values
 offer = Offer(
-    name="Fast Delivery Package", 
+    name="Fast Delivery Package",
     price=15.99,
     priceCurrency="USD",
     availableDeliveryMethod=DeliveryMethod.LockerDelivery,
@@ -25,14 +25,14 @@
 
 # Using multiple enum values in a list
 offer_multi = Offer(
-    name="Flexible Delivery Package", 
+    name="Flexible Delivery Package",
     price=19.99,
     priceCurrency="USD",
     availableDeliveryMethod=[
         DeliveryMethod.LockerDelivery,
         DeliveryMethod.OnSitePickup,
-        DeliveryMethod.ParcelService
-    ]
+        DeliveryMethod.ParcelService,
+    ],
 )
 
 # Print the offer with multiple delivery methods
@@ -55,14 +55,16 @@
 print("Notable metadata fields:")
 print(f" - ID: schema:ParcelService")
 print(f" - Label: ParcelService")
-print(f" - Comment: A private parcel service as the delivery mode available for a certain offer.")
+print(
+    f" - Comment: A private parcel service as the delivery mode available for a certain offer."
+)
 print()
 
 # Creating a MediaReview with a rating enumeration
 review = MediaReview(
     name="Image Analysis",
     author=Person(name="Media Reviewer"),
-    mediaAuthenticityCategory=MediaManipulationRatingEnumeration.OriginalMediaContent
+    mediaAuthenticityCategory=MediaManipulationRatingEnumeration.OriginalMediaContent,
 )
 
 # Print the media review
@@ -71,4 +73,4 @@
 print(json.dumps(json.loads(review_json), indent=2))
 print()
 
-print("Example completed successfully!") 
+print("Example completed successfully!")

msgspec_schemaorg/__init__.py

@@ -13,14 +13,17 @@
     "enums",
 ]
 
+
 # These imports are deferred to avoid circular dependencies when using just one part
 def __getattr__(name):
     if name == "models":
         from . import models as _models
+
         globals()["models"] = _models
         return _models
     elif name == "enums":
         from . import enums as _enums
+
         globals()["enums"] = _enums
         return _enums
     raise AttributeError(f"module '{__name__}' has no attribute '{name}'")

msgspec_schemaorg/base.py

@@ -1,6 +1,7 @@
 """
 Base classes for Schema.org models with JSON-LD compatibility.
 """
+
 from __future__ import annotations
 from typing import Any, Dict, List, Optional, Union
 import msgspec
@@ -10,16 +11,17 @@
 class SchemaOrgBase(msgspec.Struct, frozen=True, omit_defaults=True):
     """
     Base class for all Schema.org models with JSON-LD fields.
-    
+
     This class provides the standard JSON-LD fields (@id, @type, @context, etc.)
     that are used to represent linked data. All Schema.org model classes
     inherit from this base.
-    
+
     JSON-LD fields are aliased using msgspec's field renaming to ensure
     that the serialized output uses the @ prefix.
     """
+
     id: Optional[str] = field(default=None, name="@id")
     context: Optional[Union[str, Dict[str, Any]]] = field(default=None, name="@context")
     # Note: type field is intentionally omitted since it will be provided by each class
     graph: Optional[List[Dict[str, Any]]] = field(default=None, name="@graph")
-    reverse: Optional[Dict[str, Any]] = field(default=None, name="@reverse") 
+    reverse: Optional[Dict[str, Any]] = field(default=None, name="@reverse")

msgspec_schemaorg/cli.py

@@ -66,6 +66,7 @@
     'PaymentMethodType',
     'PaymentStatusType',
     'PhysicalActivityCategory',
+    'PhysicalExam',
     'PriceComponentTypeEnumeration',
     'PriceTypeEnumeration',
     'PurchaseType',