plexus-python-pulse-demeter 1.1.129__tar.gz → 1.1.131__tar.gz

{plexus_python_pulse_demeter-1.1.129 → plexus_python_pulse_demeter-1.1.131}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-pulse-demeter
-Version: 1.1.129
+Version: 1.1.131
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -19,7 +19,7 @@ Requires-Dist: plexus-python-pulse-demeter[api,cli]; extra == "all"
 Provides-Extra: api
 Requires-Dist: alembic; extra == "api"
 Requires-Dist: fastapi; extra == "api"
-Requires-Dist: httpx; extra == "api"
+Requires-Dist: httpx2; extra == "api"
 Requires-Dist: psycopg; extra == "api"
 Requires-Dist: python-multipart; extra == "api"
 Requires-Dist: ujson; extra == "api"
@@ -30,7 +30,7 @@ Provides-Extra: test
 Requires-Dist: ddt>=1.7; extra == "test"
 Requires-Dist: moto[s3,server]>=5.1; extra == "test"
 Requires-Dist: pytest-cov>=5.0; extra == "test"
-Requires-Dist: pytest-httpx>=0.35; extra == "test"
+Requires-Dist: pytest-httpx2>=1.0; extra == "test"
 Requires-Dist: pytest-order>=1.3; extra == "test"
 Requires-Dist: pytest-postgresql>=6.1; extra == "test"
 Requires-Dist: pytest>=8.3; extra == "test"

{plexus_python_pulse_demeter-1.1.129 → plexus_python_pulse_demeter-1.1.131}/README.md

@@ -1,4 +1,4 @@
-# Plexus Pulse Demeter - Data Management
+# Plexus Pulse Demeter - Registry for Data Management Platform
 
 ![Codecov](https://img.shields.io/codecov/c/github/ruyangshou/plexus-python-pulse-demeter?token=jCdqTpopDw&style=for-the-badge)
 
@@ -14,7 +14,7 @@ source .venv/bin/activate
 pip install alembic
 
 # Install Plexus Pulse Demeter to access its models
-pip install plexus-pulse-demeter/[all]
+pip install .[all]
 
 cd alembic
 
@@ -64,11 +64,11 @@ kubectl create namespace plexus-pulse
 
 # Generate secrets for Docker registry (if needed) and database connections
 # Replace placeholders with actual values
-kubectl create secret docker-registry plexus-registry-secrets \
-    --docker-server="<your_registry_server>" \
-    --docker-username="<your_username>" \
-    --docker-password="<your_password>" \
-    --docker-email="<your_email>" \
+kubectl create secret docker-registry plexus-infra-docker-registry-secrets \
+    --docker-server="<your_docker_server>" \
+    --docker-username="<your_docker_username>" \
+    --docker-password="<your_docker_password>" \
+    --docker-email="<your_docker_email>" \
     -n plexus-pulse
 
 kubectl create secret generic plexus-pulse-demeter-secrets \

{plexus_python_pulse_demeter-1.1.129 → plexus_python_pulse_demeter-1.1.131}/alembic/env.py

@@ -5,8 +5,8 @@ import alembic
 import sqlalchemy as sa
 from plexus.pulse.common.utils.ormutils import collect_model_tables
 
-from plexus.pulse.demeter.app.models.registry import BaseModel
-from plexus.pulse.demeter.app.models.registry import archive, dataset, tagging, user
+from plexus.pulse.demeter.app.models import BaseModel
+from plexus.pulse.demeter.app.models import catalog, inventory, tagging, user, workflow
 
 database_host = os.getenv("PULSE_DEMETER_DATABASE_HOST", "localhost")
 database_port = os.getenv("PULSE_DEMETER_DATABASE_PORT", "5432")
@@ -14,7 +14,7 @@ database_username = os.getenv("PULSE_DEMETER_DATABASE_USERNAME", "pulse")
 database_password = os.getenv("PULSE_DEMETER_DATABASE_PASSWORD", "pulse")
 database_database = os.getenv("PULSE_DEMETER_DATABASE_DATABASE", "pulse-demeter")
 
-print(archive.__all__ + tagging.__all__ + dataset.__all__ + user.__all__)
+print(inventory.__all__ + tagging.__all__ + catalog.__all__ + user.__all__ + workflow.__all__)
 
 url = sa.URL.create(
     drivername="postgresql+psycopg",

{plexus_python_pulse_demeter-1.1.129 → plexus_python_pulse_demeter-1.1.131}/k8s/deployment/plexus-pulse-demeter-app.deployment.yaml

@@ -14,7 +14,7 @@ spec:
         app: plexus-pulse-demeter-app
     spec:
       imagePullSecrets:
-        - name: plexus-registry-secrets
+        - name: plexus-infra-docker-registry-secrets
       containers:
         - name: plexus-pulse-demeter-app
           image: ruyangshou/plexus-pulse-demeter-app:latest

{plexus_python_pulse_demeter-1.1.129 → plexus_python_pulse_demeter-1.1.131}/pyproject.toml

@@ -21,7 +21,7 @@ dev = [
 api = [
     "alembic",
     "fastapi",
-    "httpx",
+    "httpx2",
     "psycopg",
     "python-multipart",
     "ujson",
@@ -34,7 +34,7 @@ test = [
     "ddt>=1.7",
     "moto[server,s3]>=5.1",
     "pytest-cov>=5.0",
-    "pytest-httpx>=0.35",
+    "pytest-httpx2>=1.0",
     "pytest-order>=1.3",
     "pytest-postgresql>=6.1",
     "pytest>=8.3",
@@ -68,7 +68,7 @@ all = [
 api = [
     "alembic",
     "fastapi",
-    "httpx",
+    "httpx2",
     "psycopg",
     "python-multipart",
     "ujson",
@@ -81,7 +81,7 @@ test = [
     "ddt>=1.7",
     "moto[server,s3]>=5.1",
     "pytest-cov>=5.0",
-    "pytest-httpx>=0.35",
+    "pytest-httpx2>=1.0",
     "pytest-order>=1.3",
     "pytest-postgresql>=6.1",
     "pytest>=8.3",

plexus_python_pulse_demeter-1.1.131/src/plexus/pulse/demeter/app/api/__init__.py

@@ -0,0 +1,110 @@
+import datetime
+from collections.abc import Generator
+from typing import Any, Literal
+
+import pydantic as pdt
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+from plexus.common.utils.dtutils import dt_utc_now
+
+__all__ = [
+    "Pagination",
+    "ColumnOrdering",
+    "ColumnFormatter",
+    "TableColumn",
+    "current_dt_clock",
+    "make_api",
+]
+
+
+# Naming convention for composite data models used by endpoints in this package.
+# Names describe the hierarchy and cardinality represented by the model, rather
+# than necessarily matching the underlying database relationships.
+# - Use PascalCase for model names and snake_case for field names.
+# - Use 'And' to combine singular components (one-to-one). Flatten a chain of
+#   singular components into one composite model where possible.
+# - Use 'With' to introduce a collection of related components (one-to-many).
+# - Pluralize the component represented by each collection:
+#   - For a singular component, pluralize its name: B -> Bs.
+#   - For an 'And' composite, treat the name as one unit and pluralize its final
+#     segment: BAndC -> BAndCs. Each list item contains one B and one C.
+#   - For a 'With' composite, pluralize its source segment and retain its nested
+#     collection names: BWithCs -> BsWithCs.
+# - Apply these rules recursively, preserving the order of the hierarchy.
+# - Use a nested composite when a singular component owns a collection, so the
+#   name and fields preserve that grouping.
+#
+# Examples (field declarations below are schematic):
+# - A one-to-one B one-to-one C:
+#   AAndBAndC(a: A, b: B, c: C)
+# - A one-to-many B one-to-one C:
+#   BAndC(b: B, c: C)
+#   AWithBAndCs(a: A, b_and_cs: list[BAndC])
+# - A one-to-one B one-to-many C:
+#   BWithCs(b: B, cs: list[C])
+#   AAndBWithCs(a: A, b_with_cs: BWithCs)
+# - A one-to-many B one-to-many C:
+#   BWithCs(b: B, cs: list[C])
+#   AWithBsWithCs(a: A, bs_with_cs: list[BWithCs])
+# - A one-to-many B one-to-many C one-to-many D:
+#   CWithDs(c: C, ds: list[D])
+#   BWithCsWithDs(b: B, cs_with_ds: list[CWithDs])
+#   AWithBsWithCsWithDs(a: A, bs_with_cs_with_ds: list[BWithCsWithDs])
+
+
+class Pagination(pdt.BaseModel):
+    skip: int
+    limit: int
+    total: int
+
+
+class ColumnOrdering(pdt.BaseModel):
+    semantic: Literal["lexical", "numeric", "datetime", "semver"] = "lexical"
+    direction: Literal["ascending", "descending"] = "ascending"
+
+
+class ColumnFormatter(pdt.BaseModel):
+    syntax: Literal["python_print", "python_format", "python_fstring", "python_strftime"] = "python_print"
+    template: str
+    args: list[Any] | None = None
+
+
+class TableColumn(pdt.BaseModel):
+    name: str
+    ordering: ColumnOrdering | None = None
+    formatter: ColumnFormatter | None = None
+
+
+def current_dt_clock() -> Generator[datetime.datetime, None, None]:
+    yield dt_utc_now()
+
+
+def make_api() -> FastAPI:
+    from plexus.pulse.demeter.app.api.inventory_endpoints import router as inventory_router
+    from plexus.pulse.demeter.app.api.catalog_endpoints import router as catalog_router
+    from plexus.pulse.demeter.app.api.tagging_endpoints import router as tagging_router
+    from plexus.pulse.demeter.app.api.user_endpoints import router as user_router
+    from plexus.pulse.demeter.app.api.workflow_endpoints import router as workflow_router
+    from plexus.pulse.demeter.app.api.inventory_internal_endpoints import router as inventory_internal_router
+    from plexus.pulse.demeter.app.api.catalog_internal_endpoints import router as catalog_internal_router
+    from plexus.pulse.demeter.app.api.workflow_internal_endpoints import router as workflow_internal_router
+
+    api = FastAPI(title="Pulse Demeter API", description="API for Pulse Demeter")
+    api.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+
+    api.include_router(inventory_router)
+    api.include_router(catalog_router)
+    api.include_router(workflow_router)
+    api.include_router(tagging_router)
+    api.include_router(user_router)
+    api.include_router(inventory_internal_router)
+    api.include_router(catalog_internal_router)
+    api.include_router(workflow_internal_router)
+
+    return api

plexus_python_pulse_demeter-1.1.129/src/plexus/pulse/demeter/app/api/dataset_public_endpoints.py → plexus_python_pulse_demeter-1.1.131/src/plexus/pulse/demeter/app/api/catalog_endpoints.py

@@ -23,23 +23,16 @@ from plexus.pulse.common.utils.ormutils import (
 from plexus.pulse.common.utils.sqlutils import escape_sql_like
 from plexus.pulse.common.utils.tagutils import predefined_tagsets
 
+from plexus.pulse.demeter.app.api import ColumnFormatter, ColumnOrdering, Pagination, TableColumn
 from plexus.pulse.demeter.app.api import current_dt_clock
 from plexus.pulse.demeter.app.core.database import make_session
-from plexus.pulse.demeter.app.models import ColumnFormatter, ColumnOrdering, Pagination, TableColumn
-from plexus.pulse.demeter.app.models.registry import JobStatusFlag
-from plexus.pulse.demeter.app.models.registry.dataset import (
+from plexus.pulse.demeter.app.models.catalog import (
     AnnotationGuidelineTable as GuidelineTable,
     ClassifierTaxonomyTable as TaxonomyTable,
-    DatasetPromotionTable as DatasetPromotionTable,
-    DatasetRegistrationTable as RegistrationTable,
     ModelArchitectureTable as ArchitectureTable,
-    ModelAssessmentPromotionTable as AssessmentPromotionTable,
     ModelAssessmentTable as AssessmentTable,
     ModelBenchmarkTable as BenchmarkTable,
-    ModelEvaluationTable as EvaluationTable,
-    ModelExperimentPromotionTable as ExperimentPromotionTable,
     ModelExperimentTable as ExperimentTable,
-    ModelTrainingTable as TrainingTable,
     RegisteredDatasetLayoutTable as DatasetLayoutTable,
     RegisteredDatasetSampleTable as DatasetSampleTable,
     RegisteredDatasetTable as DatasetTable,
@@ -48,41 +41,23 @@ from plexus.pulse.demeter.app.models.registry.dataset import (
     SampleClassifierTable as ClassifierTable,
     SampleLayoutTable as LayoutTable,
 )
-from plexus.pulse.demeter.app.models.registry.dataset import (
+from plexus.pulse.demeter.app.models.catalog import (
     RegisteredDataset as Dataset,
     RegisteredSample as Sample,
     SampleAnnotation as Annotation,
     SampleClassifier as Classifier,
 )
+from plexus.pulse.demeter.app.models.workflow import (
+    DatasetPromotionTable as DatasetPromotionTable,
+    DatasetRegistrationTable as RegistrationTable,
+    JobStatusFlag,
+    ModelAssessmentPromotionTable as AssessmentPromotionTable,
+    ModelEvaluationTable as EvaluationTable,
+    ModelExperimentPromotionTable as ExperimentPromotionTable,
+    ModelTrainingTable as TrainingTable,
+)
 
-router = APIRouter(prefix="/pulse_demeter/dataset_public", tags=["dataset_public"])
-
-
-# Composite model naming convention
-# - Use 'And' to join one-to-one relationships. For a chain of one-to-one relations, create a single composite model
-#   that covers the whole chain.
-# - Use 'With' to indicate one-to-many relationships.
-# - Use plural form for the target segment of a one-to-many relationship.
-#   - If the target is a one-to-one relationship, pluralize the entire relationship segment.
-#   - If the target is also one-to-many, pluralize the source segment of that nested relationship.
-#   - For multiple chained one-to-many relationships, pluralize each relevant segment.
-# - Preserve the order of segments following the hierarchy.
-# Examples:
-# - A one-to-one B one-to-one C
-#   AAndBAndC(a: A, b: B, c: C)
-# - A one-to-many B one-to-one C
-#   BAndC(b: B, c: C)
-#   AWithBAndCs(a: A, b_and_cs: list[BAndC])  # pluralize the entire one-to-one segment
-# - A one-to-one B one-to-many C
-#   BWithCs(b: B, cs: list[C])
-#   AAndBWithCs(a: A, b_with_cs: BWithCs)
-# - A one-to-many B one-to-many C
-#   BWithCs(b: B, cs: list[C])
-#   AWithBsWithCs(a: A, bs_with_cs: list[BWithCs])  # pluralize source segments
-# - A one-to-many B one-to-many C one-to-many D
-#   CWithDs(c: C, ds: list[D])
-#   BWithCsWithDs(b: B, cs_with_ds: list[CWithDs])
-#   AWithBsWithCsWithDs(a: A, bs_with_cs_with_ds: list[BWithCsWithDs])
+router = APIRouter(prefix="/pulse_demeter/catalog", tags=["catalog"])
 
 
 @router.get("/layouts", response_model=list[LayoutTable])