Use polymorphic_serialization flag and small cleanup

Signed-off-by: Nijat Khanbabayev <[email protected]>

Author: NeejWeej

.copier-answers.yaml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: f812aaa
+_commit: 973c39c
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: python
@@ -9,5 +9,5 @@ github: Point72
 project_description: ccflow is a collection of tools for workflow configuration, orchestration,
     and dependency injection
 project_name: ccflow
-python_version_primary: '3.9'
+python_version_primary: '3.11'
 team: Point72, L.P.

.gitignore

@@ -157,3 +157,11 @@ ccflow/labextension
 
 # Rust
 target
+
+# Examples
+outputs
+raw.html
+extracted.csv
+etl.db
+lobsters.html
+lobsters.csv

ccflow/__init__.py

@@ -1,11 +1,16 @@
-__version__ = "0.6.8"
+__version__ = "0.7.0"
+
+# Import exttypes early so modules that import `from ccflow import PyObjectPath` during
+# initialization find it (avoids circular import issues with functions that import utilities
+# which, in turn, import `ccflow`).
+from .exttypes import *  # noqa: I001
 
 from .arrow import *
 from .base import *
+from .compose import *
 from .callable import *
 from .context import *
 from .enums import Enum
-from .exttypes import *
 from .global_state import *
 from .models import *
 from .object_config import *

ccflow/base.py

@@ -30,7 +30,6 @@
 log = logging.getLogger(__name__)
 
 __all__ = (
-    "model_alias",
     "BaseModel",
     "ModelRegistry",
     "ModelType",
@@ -118,19 +117,10 @@ def type_(self) -> PyObjectPath:
         # where the default behavior is just to drop the mis-named value. This prevents that
         extra="forbid",
         ser_json_timedelta="float",
+        # Polymorphic serialization is the behavior of allowing a subclass of a model (or Pydantic dataclass) to override serialization so that the subclass' serialization is used, rather than the original model types's serialization. This will expose all the data defined on the subclass in the serialized payload.
+        polymorphic_serialization=True,
     )
 
-    # https://docs.pydantic.dev/latest/concepts/serialization/#overriding-the-serialize_as_any-default-false
-    def model_dump(self, **kwargs) -> dict[str, Any]:
-        if not kwargs.get("serialize_as_any"):
-            kwargs["serialize_as_any"] = True
-        return super().model_dump(**kwargs)
-
-    def model_dump_json(self, **kwargs) -> str:
-        if not kwargs.get("serialize_as_any"):
-            kwargs["serialize_as_any"] = True
-        return super().model_dump_json(**kwargs)
-
     def __str__(self):
         # Because the standard string representation does not include class name
         return repr(self)
@@ -200,7 +190,7 @@ def _base_model_validator(cls, v, handler, info):
 
         if isinstance(v, PydanticBaseModel):
             # Coerce from one BaseModel type to another (because it worked automatically in v1)
-            v = v.model_dump(serialize_as_any=True, exclude={"type_"})
+            v = v.model_dump(exclude={"type_"})
 
         return handler(v)
 
@@ -272,20 +262,6 @@ def _is_config_subregistry(value):
     return False
 
 
-def model_alias(model_name: str) -> BaseModel:
-    """Function to alias a BaseModel by name in the root registry.
-
-    Useful for configs in hydra where we want a config object to point directly to another config object.
-
-    Args:
-        model_name: The name of the underlying model to point to in the registry
-    Example:
-        _target_: ccflow.model_alias
-        model_name: foo
-    """
-    return BaseModel.model_validate(model_name)
-
-
 ModelType = TypeVar("ModelType", bound=BaseModel)
 
 
@@ -325,8 +301,7 @@ def _validate_name(cls, v):
     @model_serializer(mode="wrap")
     def _registry_serializer(self, handler):
         values = handler(self)
-        models_serialized = {k: model.model_dump(serialize_as_any=True, by_alias=True) for k, model in self._models.items()}
-        values["models"] = models_serialized
+        values["models"] = self._models
         return values
 
     @property