linter

Author: nachiket-galileo

src/galileo/__future__/__init__.py

@@ -20,11 +20,8 @@
 from galileo.__future__.prompt import Prompt
 from galileo.__future__.types import MetricSpec
 from galileo.schema.message import Message
-<<<<<<< HEAD
-from galileo.search import RecordType
-=======
 from galileo.schema.metrics import GalileoScorers, LocalMetricConfig
->>>>>>> 37c9012 (add/update)
+from galileo.search import RecordType
 from galileo.utils.logging import enable_console_logging
 from galileo_core.schemas.logging.llm import MessageRole
 from galileo_core.schemas.logging.step import StepType

src/galileo/__future__/log_stream.py

@@ -395,11 +395,10 @@ def set_metrics(
 
         Args:
             metrics: List of metrics to set. Supports:
-                - Metric.scorers values (e.g., Metric.scorers.correctness) - Recommended
+                - GalileoScorers enum values (e.g., GalileoScorers.correctness)
                 - Metric objects (including from Metric.get(id="..."))
                 - LocalMetricConfig objects for custom scoring functions
                 - String names of built-in metrics
-                - GalileoScorers enum values (backward compatible)
 
         Returns
         -------
@@ -423,7 +422,6 @@ def set_metrics(
                 Metric.get(id="metric-from-console-uuid"),  # From console
             ])
         """
-<<<<<<< HEAD
         try:
             logger.info(f"LogStream.enable_metrics: id='{self.id}' metrics={[str(m) for m in metrics]} - started")
             log_streams_service = LogStreams()
@@ -692,103 +690,6 @@ def context(self) -> Any:
                 response = openai_client.chat.completions.create(...)
         """
         return galileo_context(project=self.project.name if self.project else None, log_stream=self.name)
-=======
-        logger.info(f"LogStream.set_metrics: id='{self.id}' metrics={[str(m) for m in metrics]} - started")
-        log_streams_service = LogStreams()
-        log_stream = log_streams_service.get(name=self.name, project_id=self.project_id)
-        if log_stream is None:
-            raise ValueError(f"Log stream '{self.name}' not found")
-        result = log_stream.enable_metrics(metrics)
-        logger.info(f"LogStream.set_metrics: id='{self.id}' - completed")
-        return result
-
-    def add_metrics(
-        self, metrics: builtins.list[GalileoScorers | Metric | LocalMetricConfig | str]
-    ) -> builtins.list[LocalMetricConfig]:
-        """
-        Add metrics to the existing metrics on this log stream.
-
-        This adds to the current set of metrics without removing existing ones.
-
-        Args:
-            metrics: List of metrics to add. Supports:
-                - GalileoScorers enum values (e.g., GalileoScorers.correctness)
-                - Metric objects (including from Metric.get(id="..."))
-                - LocalMetricConfig objects for custom scoring functions
-                - String names of built-in metrics
-
-        Returns
-        -------
-            List[LocalMetricConfig]: Local metric configurations that must be
-                computed client-side.
-
-        Raises
-        ------
-            ValueError: If any specified metrics are unknown.
-
-        Examples
-        --------
-            log_stream = LogStream.get(name="Production Logs", project_name="My Project")
-
-            # Add more metrics to existing ones
-            log_stream.add_metrics([
-                Metric.scorers.toxicity,
-                "prompt_injection",
-            ])
-        """
-        logger.info(f"LogStream.add_metrics: id='{self.id}' adding {len(metrics)} metrics - started")
-
-        # Get current metrics
-        current_metric_names: set[str] = set(self.get_metrics())
-        logger.debug(f"LogStream.add_metrics: current metrics={current_metric_names}")
-
-        # Build combined list (avoid duplicates by name)
-        combined_metrics = list(metrics)  # Start with new metrics
-
-        # Add existing metrics that aren't being replaced
-        for metric_name in current_metric_names:
-            # Check if this metric is being replaced
-            is_replaced = any(
-                (isinstance(m, str) and m == metric_name)
-                or (hasattr(m, "name") and m.name == metric_name)
-                or (isinstance(m, GalileoScorers) and m.value.lstrip("_") == metric_name)
-                for m in metrics
-            )
-            if not is_replaced:
-                combined_metrics.append(metric_name)
-
-        logger.info(f"LogStream.add_metrics: setting {len(combined_metrics)} total metrics")
-        return self.set_metrics(combined_metrics)
-
-    def enable_metrics(
-        self, metrics: builtins.list[GalileoScorers | Metric | LocalMetricConfig | str]
-    ) -> builtins.list[LocalMetricConfig]:
-        """
-        Enable metrics on this log stream.
-
-        Alias for set_metrics() for backward compatibility.
-
-        Args:
-            metrics: List of metrics to enable.
-
-        Returns
-        -------
-            List[LocalMetricConfig]: Local metric configurations that must be
-                computed client-side.
-
-        Examples
-        --------
-            log_stream.enable_metrics([
-                Metric.scorers.correctness,
-                "completeness",
-            ])
-        """
-        return self.set_metrics(metrics)
-
-    def __str__(self) -> str:
-        """String representation of the log stream."""
-        return f"LogStream(name='{self.name}', id='{self.id}', project_id='{self.project_id}')"
->>>>>>> 37c9012 (add/update)
 
     @property
     def project(self) -> Project | None:

src/galileo/__future__/metric.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 from typing import Any, Callable
 
-from galileo.__future__.base import BusinessObjectMixin, SyncState
+from galileo.__future__.base import StateManagementMixin, SyncState
 from galileo.__future__.configuration import Configuration
 from galileo.__future__.exceptions import ValidationError
 from galileo.metrics import Metrics
@@ -49,7 +49,7 @@ def __dir__(self) -> list[str]:
         return [scorer.name for scorer in GalileoScorers]
 
 
-class Metric(BusinessObjectMixin):
+class Metric(StateManagementMixin):
     """
     Unified, object-centric interface for Galileo metrics.
 
@@ -424,7 +424,7 @@ def get(cls, *, id: str | None = None, name: str | None = None) -> Metric | None
                 return None
 
         instance = cls.__new__(cls)
-        BusinessObjectMixin.__init__(instance)
+        StateManagementMixin.__init__(instance)
         instance._populate_from_scorer_response(retrieved_scorer)
         instance._set_state(SyncState.SYNCED)
         return instance
@@ -463,7 +463,7 @@ def list(
         result = []
         for retrieved_scorer in retrieved_scorers:
             instance = cls.__new__(cls)
-            BusinessObjectMixin.__init__(instance)
+            StateManagementMixin.__init__(instance)
             instance._populate_from_scorer_response(retrieved_scorer)
             instance._set_state(SyncState.SYNCED)
             result.append(instance)