flowyml 1.5.0__tar.gz → 1.7.0__tar.gz

{flowyml-1.5.0 → flowyml-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowyml
-Version: 1.5.0
+Version: 1.7.0
 Summary: Next-Generation ML Pipeline Framework
 License: Apache-2.0
 License-File: LICENSE
@@ -23,13 +23,14 @@ Provides-Extra: aws
 Provides-Extra: azure
 Provides-Extra: gcp
 Provides-Extra: pytorch
+Provides-Extra: rich
 Provides-Extra: sklearn
 Provides-Extra: tensorflow
 Provides-Extra: ui
 Requires-Dist: click (>=8.0.0)
 Requires-Dist: cloudpickle (>=2.0.0)
 Requires-Dist: croniter (>=2.0.1,<3.0.0)
-Requires-Dist: fastapi (>=0.122.0,<0.123.0) ; extra == "ui"
+Requires-Dist: fastapi (>=0.122.0,<0.123.0) ; extra == "ui" or extra == "all"
 Requires-Dist: google-cloud-aiplatform (>=1.35.0) ; extra == "gcp" or extra == "all"
 Requires-Dist: google-cloud-storage (>=2.10.0) ; extra == "gcp" or extra == "all"
 Requires-Dist: httpx (>=0.24,<0.28)
@@ -41,6 +42,7 @@ Requires-Dist: pydantic (>=2.0.0)
 Requires-Dist: python-multipart (>=0.0.6) ; extra == "ui" or extra == "all"
 Requires-Dist: pytz (>=2024.1,<2025.0)
 Requires-Dist: pyyaml (>=6.0)
+Requires-Dist: rich (>=13.0.0) ; extra == "rich"
 Requires-Dist: scikit-learn (>=1.0.0) ; extra == "sklearn" or extra == "all"
 Requires-Dist: sqlalchemy (>=2.0.0)
 Requires-Dist: tensorflow (>=2.12.0) ; extra == "tensorflow" or extra == "all"
@@ -254,7 +256,7 @@ pipeline.run(debug=True)  # Pauses at breakpoint
 Assets are not just files; they are first-class citizens with lineage, metadata, and versioning.
 
 ```python
-from flowyml.core import Dataset, Model, Metrics, FeatureSet
+from flowyml import Dataset, Model, Metrics, FeatureSet
 
 # Assets track their producer, lineage, and metadata automatically
 dataset = Dataset.create(data=df, name="training_data", metadata={"source": "s3"})

{flowyml-1.5.0 → flowyml-1.7.0}/README.md

@@ -199,7 +199,7 @@ pipeline.run(debug=True)  # Pauses at breakpoint
 Assets are not just files; they are first-class citizens with lineage, metadata, and versioning.
 
 ```python
-from flowyml.core import Dataset, Model, Metrics, FeatureSet
+from flowyml import Dataset, Model, Metrics, FeatureSet
 
 # Assets track their producer, lineage, and metadata automatically
 dataset = Dataset.create(data=df, name="training_data", metadata={"source": "s3"})

{flowyml-1.5.0 → flowyml-1.7.0}/flowyml/__init__.py

@@ -14,7 +14,7 @@ from flowyml.core.step import step, Step
 from flowyml.core.pipeline import Pipeline
 from flowyml.core.executor import Executor, LocalExecutor
 from flowyml.core.cache import CacheStrategy
-from flowyml.core.conditional import Condition, ConditionalBranch, Switch, when, unless
+from flowyml.core.conditional import Condition, ConditionalBranch, Switch, when, unless, If
 from flowyml.core.parallel import ParallelExecutor, DataParallelExecutor, BatchExecutor, parallel_map
 from flowyml.core.error_handling import (
     CircuitBreaker,
@@ -115,6 +115,7 @@ __all__ = [
     "Condition",
     "ConditionalBranch",
     "Switch",
+    "If",
     "when",
     "unless",
     # Parallel Execution

{flowyml-1.5.0 → flowyml-1.7.0}/flowyml/assets/featureset.py

@@ -67,19 +67,36 @@ class FeatureSet(Asset):
             source_dataset: Name of source dataset
             **kwargs: Additional metadata
         """
-        # Initialize base asset
-        metadata = FeatureSetMetadata(
+        # Initialize base asset first
+        super().__init__(
             name=name,
-            type="featureset",
+            version=kwargs.get("version"),
+            data=None,
+            parent=kwargs.get("parent"),
+            tags=kwargs.get("tags"),
+            properties=kwargs.get("properties"),
+        )
+
+        # Create FeatureSet-specific metadata
+        feature_set_metadata = FeatureSetMetadata(
+            asset_id=self.asset_id,
+            name=name,
+            version=self.version,
+            asset_type=self.__class__.__name__,
+            created_at=self.metadata.created_at,
+            created_by=self.metadata.created_by,
+            parent_ids=self.metadata.parent_ids,
+            tags=self.metadata.tags,
+            properties=self.metadata.properties,
             feature_names=feature_names or [],
             num_features=len(feature_names) if feature_names else 0,
             num_samples=num_samples,
             transformations=transformations or [],
             source_dataset=source_dataset,
-            **kwargs,
         )
 
-        super().__init__(name=name, type="featureset", metadata=metadata)
+        # Replace metadata with FeatureSet-specific metadata
+        self.metadata = feature_set_metadata
         self._data = data
 
         # Extract feature metadata if data provided
@@ -147,6 +164,11 @@ class FeatureSet(Asset):
         """Get the feature data."""
         return self._data
 
+    @data.setter
+    def data(self, value: Any) -> None:
+        """Set the feature data."""
+        self._data = value
+
     @property
     def feature_names(self) -> list[str]:
         """Get feature names."""
@@ -188,6 +210,7 @@ class FeatureSet(Asset):
         data: Any,
         name: str | None = None,
         feature_names: list[str] | None = None,
+        num_samples: int = 0,
         transformations: list[str] | None = None,
         source_dataset: str | None = None,
         **kwargs,
@@ -198,6 +221,7 @@ class FeatureSet(Asset):
             data: The feature matrix
             name: Name of the feature set (auto-generated if not provided)
             feature_names: List of feature names
+            num_samples: Number of samples in the feature set
             transformations: List of transformations applied
             source_dataset: Name of source dataset
             **kwargs: Additional metadata
@@ -213,6 +237,7 @@ class FeatureSet(Asset):
             name=name,
             data=data,
             feature_names=feature_names,
+            num_samples=num_samples,
             transformations=transformations,
             source_dataset=source_dataset,
             **kwargs,

{flowyml-1.5.0 → flowyml-1.7.0}/flowyml/assets/metrics.py

@@ -93,18 +93,61 @@ class Metrics(Asset):
         parent: Asset | None = None,
         tags: dict[str, str] | None = None,
         properties: dict[str, Any] | None = None,
-        **metrics,
+        metadata: dict[str, Any] | None = None,
+        metrics: dict[str, Any] | None = None,
+        **kwargs,
     ) -> "Metrics":
         """Factory method to create metrics.
 
+        Supports multiple ways to provide metrics:
+        1. As keyword arguments: Metrics.create(accuracy=0.95, loss=0.05)
+        2. As a dict: Metrics.create(metrics={"accuracy": 0.95, "loss": 0.05})
+        3. Mixed: Metrics.create(metrics={"accuracy": 0.95}, loss=0.05)
+
+        Args:
+            name: Name of the metrics asset
+            version: Version string
+            parent: Parent asset for lineage
+            tags: Tags dictionary (or use metadata for convenience)
+            properties: Properties dictionary
+            metadata: Metadata dictionary (merged into tags and properties)
+            metrics: Metrics as a dictionary (alternative to **kwargs)
+            **kwargs: Additional metrics as keyword arguments
+
         Example:
+            >>> # Using keyword arguments
             >>> metrics = Metrics.create(accuracy=0.95, loss=0.05, training_time="2h 15m")
+
+            >>> # Using metrics dict
+            >>> metrics = Metrics.create(
+            ...     name="example_metrics",
+            ...     metrics={"test_accuracy": 0.93, "test_loss": 0.07},
+            ...     metadata={"source": "example"},
+            ... )
         """
+        # Merge metrics dict with kwargs
+        all_metrics = {}
+        if metrics:
+            all_metrics.update(metrics)
+        all_metrics.update(kwargs)
+
+        # Handle metadata - merge into tags and properties
+        final_tags = tags or {}
+        final_properties = properties or {}
+        if metadata:
+            # If metadata contains string values, treat as tags
+            # Otherwise, merge into properties
+            for key, value in metadata.items():
+                if isinstance(value, str):
+                    final_tags[key] = value
+                else:
+                    final_properties[key] = value
+
         return cls(
             name=name or "metrics",
             version=version,
-            data=metrics,
+            data=all_metrics if all_metrics else None,
             parent=parent,
-            tags=tags,
-            properties=properties,
+            tags=final_tags,
+            properties=final_properties,
         )