genesis-flow 1.0.0__tar.gz → 1.0.3__tar.gz

{genesis_flow-1.0.0/genesis_flow.egg-info → genesis_flow-1.0.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: genesis-flow
-Version: 1.0.0
-Summary: Genesis-Flow: Lightweight, secure MLflow fork for Genesis platform
+Version: 1.0.3
+Summary: Genesis-Flow: MLflow v3.1.4 compatible fork for Genesis platform
 Maintainer-email: Databricks <mlflow-oss-maintainers@googlegroups.com>
 License: Copyright 2018 Databricks, Inc.  All rights reserved.
         
@@ -268,6 +268,36 @@ Requires-Dist: databricks-sdk<1,>=0.20.0; extra == "databricks"
 Requires-Dist: azure-storage-file-datalake>12; extra == "databricks"
 Requires-Dist: boto3>1; extra == "databricks"
 Requires-Dist: botocore; extra == "databricks"
+Requires-Dist: databricks-agents<2.0,>=1.0.0; extra == "databricks"
+Provides-Extra: mlserver
+Requires-Dist: mlserver!=1.3.1,<2.0.0,>=1.2.0; extra == "mlserver"
+Requires-Dist: mlserver-mlflow!=1.3.1,<2.0.0,>=1.2.0; extra == "mlserver"
+Provides-Extra: gateway
+Requires-Dist: fastapi<1; extra == "gateway"
+Requires-Dist: uvicorn[standard]<1; extra == "gateway"
+Requires-Dist: watchfiles<2; extra == "gateway"
+Requires-Dist: aiohttp<4; extra == "gateway"
+Requires-Dist: boto3<2,>=1.28.56; extra == "gateway"
+Requires-Dist: tiktoken<1; extra == "gateway"
+Requires-Dist: slowapi<1,>=0.1.9; extra == "gateway"
+Provides-Extra: genai
+Requires-Dist: fastapi<1; extra == "genai"
+Requires-Dist: uvicorn[standard]<1; extra == "genai"
+Requires-Dist: watchfiles<2; extra == "genai"
+Requires-Dist: aiohttp<4; extra == "genai"
+Requires-Dist: boto3<2,>=1.28.56; extra == "genai"
+Requires-Dist: tiktoken<1; extra == "genai"
+Requires-Dist: slowapi<1,>=0.1.9; extra == "genai"
+Provides-Extra: sqlserver
+Requires-Dist: mlflow-dbstore; extra == "sqlserver"
+Provides-Extra: aliyun-oss
+Requires-Dist: aliyunstoreplugin; extra == "aliyun-oss"
+Provides-Extra: xethub
+Requires-Dist: mlflow-xethub; extra == "xethub"
+Provides-Extra: jfrog
+Requires-Dist: mlflow-jfrog-plugin; extra == "jfrog"
+Provides-Extra: langchain
+Requires-Dist: langchain<=0.3.25,>=0.1.0; extra == "langchain"
 Provides-Extra: auth
 Requires-Dist: Flask-WTF<2; extra == "auth"
 Provides-Extra: extras

{genesis_flow-1.0.0 → genesis_flow-1.0.3/genesis_flow.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: genesis-flow
-Version: 1.0.0
-Summary: Genesis-Flow: Lightweight, secure MLflow fork for Genesis platform
+Version: 1.0.3
+Summary: Genesis-Flow: MLflow v3.1.4 compatible fork for Genesis platform
 Maintainer-email: Databricks <mlflow-oss-maintainers@googlegroups.com>
 License: Copyright 2018 Databricks, Inc.  All rights reserved.
         
@@ -268,6 +268,36 @@ Requires-Dist: databricks-sdk<1,>=0.20.0; extra == "databricks"
 Requires-Dist: azure-storage-file-datalake>12; extra == "databricks"
 Requires-Dist: boto3>1; extra == "databricks"
 Requires-Dist: botocore; extra == "databricks"
+Requires-Dist: databricks-agents<2.0,>=1.0.0; extra == "databricks"
+Provides-Extra: mlserver
+Requires-Dist: mlserver!=1.3.1,<2.0.0,>=1.2.0; extra == "mlserver"
+Requires-Dist: mlserver-mlflow!=1.3.1,<2.0.0,>=1.2.0; extra == "mlserver"
+Provides-Extra: gateway
+Requires-Dist: fastapi<1; extra == "gateway"
+Requires-Dist: uvicorn[standard]<1; extra == "gateway"
+Requires-Dist: watchfiles<2; extra == "gateway"
+Requires-Dist: aiohttp<4; extra == "gateway"
+Requires-Dist: boto3<2,>=1.28.56; extra == "gateway"
+Requires-Dist: tiktoken<1; extra == "gateway"
+Requires-Dist: slowapi<1,>=0.1.9; extra == "gateway"
+Provides-Extra: genai
+Requires-Dist: fastapi<1; extra == "genai"
+Requires-Dist: uvicorn[standard]<1; extra == "genai"
+Requires-Dist: watchfiles<2; extra == "genai"
+Requires-Dist: aiohttp<4; extra == "genai"
+Requires-Dist: boto3<2,>=1.28.56; extra == "genai"
+Requires-Dist: tiktoken<1; extra == "genai"
+Requires-Dist: slowapi<1,>=0.1.9; extra == "genai"
+Provides-Extra: sqlserver
+Requires-Dist: mlflow-dbstore; extra == "sqlserver"
+Provides-Extra: aliyun-oss
+Requires-Dist: aliyunstoreplugin; extra == "aliyun-oss"
+Provides-Extra: xethub
+Requires-Dist: mlflow-xethub; extra == "xethub"
+Provides-Extra: jfrog
+Requires-Dist: mlflow-jfrog-plugin; extra == "jfrog"
+Provides-Extra: langchain
+Requires-Dist: langchain<=0.3.25,>=0.1.0; extra == "langchain"
 Provides-Extra: auth
 Requires-Dist: Flask-WTF<2; extra == "auth"
 Provides-Extra: extras

{genesis_flow-1.0.0 → genesis_flow-1.0.3}/genesis_flow.egg-info/SOURCES.txt

@@ -144,12 +144,14 @@ mlflow/evaluation/evaluation.py
 mlflow/evaluation/evaluation_tag.py
 mlflow/evaluation/fluent.py
 mlflow/evaluation/utils.py
+mlflow/gateway/providers/bedrock.py
 mlflow/gemini/__init__.py
 mlflow/gemini/autolog.py
 mlflow/gemini/chat.py
 mlflow/genai/__init__.py
 mlflow/genai/scheduled_scorers.py
 mlflow/genai/datasets/__init__.py
+mlflow/genai/datasets/databricks_evaluation_dataset_source.py
 mlflow/genai/datasets/evaluation_dataset.py
 mlflow/genai/evaluation/__init__.py
 mlflow/genai/evaluation/base.py
@@ -376,6 +378,7 @@ mlflow/sklearn/utils.py
 mlflow/smolagents/__init__.py
 mlflow/smolagents/autolog.py
 mlflow/smolagents/chat.py
+mlflow/spark/__init__.py
 mlflow/store/__init__.py
 mlflow/store/_unity_catalog/__init__.py
 mlflow/store/_unity_catalog/lineage/__init__.py

{genesis_flow-1.0.0 → genesis_flow-1.0.3}/genesis_flow.egg-info/requires.txt

@@ -27,6 +27,9 @@ gunicorn<24
 [:platform_system == "Windows"]
 waitress<4
 
+[aliyun-oss]
+aliyunstoreplugin
+
 [all]
 genesis-flow[cloud,llm,pytorch,transformers]
 
@@ -43,6 +46,7 @@ databricks-sdk<1,>=0.20.0
 azure-storage-file-datalake>12
 boto3>1
 botocore
+databricks-agents<2.0,>=1.0.0
 
 [extras]
 prometheus-flask-exporter
@@ -51,14 +55,48 @@ matplotlib<4
 fastapi<1
 uvicorn<1
 
+[gateway]
+fastapi<1
+uvicorn[standard]<1
+watchfiles<2
+aiohttp<4
+boto3<2,>=1.28.56
+tiktoken<1
+slowapi<1,>=0.1.9
+
+[genai]
+fastapi<1
+uvicorn[standard]<1
+watchfiles<2
+aiohttp<4
+boto3<2,>=1.28.56
+tiktoken<1
+slowapi<1,>=0.1.9
+
+[jfrog]
+mlflow-jfrog-plugin
+
+[langchain]
+langchain<=0.3.25,>=0.1.0
+
 [llm]
 openai>=1.0.0
 langchain<=0.3.25,>=0.1.0
 
+[mlserver]
+mlserver!=1.3.1,<2.0.0,>=1.2.0
+mlserver-mlflow!=1.3.1,<2.0.0,>=1.2.0
+
 [pytorch]
 torch>=2.0.0
 torchvision>=0.15.0
 
+[sqlserver]
+mlflow-dbstore
+
 [transformers]
 transformers>=4.36.0
 sentencepiece>=0.1.99
+
+[xethub]
+mlflow-xethub

{genesis_flow-1.0.0 → genesis_flow-1.0.3}/mlflow/data/dataset_source_registry.py

@@ -217,3 +217,11 @@ try:
     _dataset_source_registry.register(UCVolumeDatasetSource)
 except ImportError:
     pass
+try:
+    from mlflow.genai.datasets.databricks_evaluation_dataset_source import (
+        DatabricksEvaluationDatasetSource,
+    )
+
+    _dataset_source_registry.register(DatabricksEvaluationDatasetSource)
+except ImportError:
+    pass

genesis_flow-1.0.3/mlflow/gateway/providers/bedrock.py

@@ -0,0 +1,298 @@
+import json
+import time
+from enum import Enum
+
+from mlflow.gateway.config import AmazonBedrockConfig, AWSIdAndKey, AWSRole, RouteConfig
+from mlflow.gateway.constants import (
+    MLFLOW_AI_GATEWAY_ANTHROPIC_DEFAULT_MAX_TOKENS,
+)
+from mlflow.gateway.exceptions import AIGatewayConfigException, AIGatewayException
+from mlflow.gateway.providers.anthropic import AnthropicAdapter
+from mlflow.gateway.providers.base import BaseProvider, ProviderAdapter
+from mlflow.gateway.providers.cohere import CohereAdapter
+from mlflow.gateway.providers.utils import rename_payload_keys
+from mlflow.gateway.schemas import completions
+
+AWS_BEDROCK_ANTHROPIC_MAXIMUM_MAX_TOKENS = 8191
+
+
+class AmazonBedrockAnthropicAdapter(AnthropicAdapter):
+    @classmethod
+    def chat_to_model(cls, payload, config):
+        payload = super().chat_to_model(payload, config)
+        # "model" keys are not supported in Bedrock"
+        payload.pop("model", None)
+        return payload
+
+    @classmethod
+    def completions_to_model(cls, payload, config):
+        payload = super().completions_to_model(payload, config)
+
+        if "\n\nHuman:" not in payload.get("stop_sequences", []):
+            payload.setdefault("stop_sequences", []).append("\n\nHuman:")
+
+        payload["max_tokens_to_sample"] = min(
+            payload.get("max_tokens_to_sample", MLFLOW_AI_GATEWAY_ANTHROPIC_DEFAULT_MAX_TOKENS),
+            AWS_BEDROCK_ANTHROPIC_MAXIMUM_MAX_TOKENS,
+        )
+
+        # "model" keys are not supported in Bedrock"
+        payload.pop("model", None)
+        return payload
+
+    @classmethod
+    def model_to_completions(cls, payload, config):
+        payload["model"] = config.model.name
+        return super().model_to_completions(payload, config)
+
+
+class AWSTitanAdapter(ProviderAdapter):
+    # TODO handle top_p, top_k, etc.
+    @classmethod
+    def completions_to_model(cls, payload, config):
+        n = payload.pop("n", 1)
+        if n != 1:
+            raise AIGatewayException(
+                status_code=422,
+                detail=f"'n' must be '1' for AWS Titan models. Received value: '{n}'.",
+            )
+
+        # The range of Titan's temperature is 0-1, but ours is 0-2, so we halve it
+        if "temperature" in payload:
+            payload["temperature"] = 0.5 * payload["temperature"]
+        return {
+            "inputText": payload.pop("prompt"),
+            "textGenerationConfig": rename_payload_keys(
+                payload, {"max_tokens": "maxTokenCount", "stop": "stopSequences"}
+            ),
+        }
+
+    @classmethod
+    def model_to_completions(cls, resp, config):
+        return completions.ResponsePayload(
+            created=int(time.time()),
+            object="text_completion",
+            model=config.model.name,
+            choices=[
+                completions.Choice(
+                    index=idx,
+                    text=candidate.get("outputText"),
+                    finish_reason=None,
+                )
+                for idx, candidate in enumerate(resp.get("results", []))
+            ],
+            usage=completions.CompletionsUsage(
+                prompt_tokens=None,
+                completion_tokens=None,
+                total_tokens=None,
+            ),
+        )
+
+    @classmethod
+    def embeddings_to_model(cls, payload, config):
+        raise NotImplementedError
+
+    @classmethod
+    def model_to_embeddings(cls, resp, config):
+        raise NotImplementedError
+
+
+class AI21Adapter(ProviderAdapter):
+    # TODO handle top_p, top_k, etc.
+    @classmethod
+    def completions_to_model(cls, payload, config):
+        return rename_payload_keys(
+            payload,
+            {
+                "stop": "stopSequences",
+                "n": "numResults",
+                "max_tokens": "maxTokens",
+            },
+        )
+
+    @classmethod
+    def model_to_completions(cls, resp, config):
+        return completions.ResponsePayload(
+            created=int(time.time()),
+            object="text_completion",
+            model=config.model.name,
+            choices=[
+                completions.Choice(
+                    index=idx,
+                    text=candidate.get("data", {}).get("text"),
+                    finish_reason=None,
+                )
+                for idx, candidate in enumerate(resp.get("completions", []))
+            ],
+            usage=completions.CompletionsUsage(
+                prompt_tokens=None,
+                completion_tokens=None,
+                total_tokens=None,
+            ),
+        )
+
+    @classmethod
+    def embeddings_to_model(cls, payload, config):
+        raise NotImplementedError
+
+    @classmethod
+    def model_to_embeddings(cls, resp, config):
+        raise NotImplementedError
+
+
+class AmazonBedrockModelProvider(Enum):
+    AMAZON = "amazon"
+    COHERE = "cohere"
+    AI21 = "ai21"
+    ANTHROPIC = "anthropic"
+
+    @property
+    def adapter_class(self) -> type[ProviderAdapter]:
+        return AWS_MODEL_PROVIDER_TO_ADAPTER.get(self)
+
+    @classmethod
+    def of_str(cls, name: str):
+        name = name.lower()
+
+        for opt in cls:
+            if opt.name.lower() in name or opt.value.lower() in name:
+                return opt
+
+
+AWS_MODEL_PROVIDER_TO_ADAPTER = {
+    AmazonBedrockModelProvider.COHERE: CohereAdapter,
+    AmazonBedrockModelProvider.ANTHROPIC: AmazonBedrockAnthropicAdapter,
+    AmazonBedrockModelProvider.AMAZON: AWSTitanAdapter,
+    AmazonBedrockModelProvider.AI21: AI21Adapter,
+}
+
+
+class AmazonBedrockProvider(BaseProvider):
+    NAME = "Amazon Bedrock"
+    CONFIG_TYPE = AmazonBedrockConfig
+
+    def __init__(self, config: RouteConfig):
+        super().__init__(config)
+
+        if config.model.config is None or not isinstance(config.model.config, AmazonBedrockConfig):
+            raise TypeError(f"Invalid config type {config.model.config}")
+        self.bedrock_config: AmazonBedrockConfig = config.model.config
+        self._client = None
+        self._client_created = 0
+
+    def _client_expired(self):
+        if not isinstance(self.bedrock_config.aws_config, AWSRole):
+            return False
+
+        return (
+            (time.monotonic_ns() - self._client_created)
+            >= (self.bedrock_config.aws_config.session_length_seconds) * 1_000_000_000,
+        )
+
+    def get_bedrock_client(self):
+        import boto3
+        import botocore.exceptions
+
+        if self._client is not None and not self._client_expired():
+            return self._client
+
+        session = boto3.Session(**self._construct_session_args())
+
+        try:
+            self._client, self._client_created = (
+                session.client(
+                    service_name="bedrock-runtime",
+                    **self._construct_client_args(session),
+                ),
+                time.monotonic_ns(),
+            )
+            return self._client
+        except botocore.exceptions.UnknownServiceError as e:
+            raise AIGatewayConfigException(
+                "Cannot create Amazon Bedrock client; ensure boto3/botocore "
+                "linked from the Amazon Bedrock user guide are installed. "
+                "Otherwise likely missing credentials or accessing account without to "
+                "Amazon Bedrock Private Preview"
+            ) from e
+
+    def _construct_session_args(self):
+        session_args = {
+            "region_name": self.bedrock_config.aws_config.aws_region,
+        }
+
+        return {k: v for k, v in session_args.items() if v}
+
+    def _construct_client_args(self, session):
+        aws_config = self.bedrock_config.aws_config
+
+        if isinstance(aws_config, AWSRole):
+            role = session.client(service_name="sts").assume_role(
+                RoleArn=aws_config.aws_role_arn,
+                RoleSessionName="ai-gateway-bedrock",
+                DurationSeconds=aws_config.session_length_seconds,
+            )
+            return {
+                "aws_access_key_id": role["Credentials"]["AccessKeyId"],
+                "aws_secret_access_key": role["Credentials"]["SecretAccessKey"],
+                "aws_session_token": role["Credentials"]["SessionToken"],
+            }
+        elif isinstance(aws_config, AWSIdAndKey):
+            return {
+                "aws_access_key_id": aws_config.aws_access_key_id,
+                "aws_secret_access_key": aws_config.aws_secret_access_key,
+                "aws_session_token": aws_config.aws_session_token,
+            }
+        else:
+            return {}
+
+    @property
+    def _underlying_provider(self):
+        if (not self.config.model.name) or "." not in self.config.model.name:
+            return None
+        return AmazonBedrockModelProvider.of_str(self.config.model.name)
+
+    @property
+    def adapter_class(self) -> type[ProviderAdapter]:
+        provider = self._underlying_provider
+        if not provider:
+            raise AIGatewayException(
+                status_code=422,
+                detail=f"Unknown Amazon Bedrock model type {self._underlying_provider}",
+            )
+        adapter = provider.adapter_class
+        if not adapter:
+            raise AIGatewayException(
+                status_code=422,
+                detail=f"Don't know how to handle {self._underlying_provider} for Amazon Bedrock",
+            )
+        return adapter
+
+    def _request(self, body):
+        import botocore.exceptions
+
+        try:
+            response = self.get_bedrock_client().invoke_model(
+                body=json.dumps(body).encode(),
+                modelId=self.config.model.name,
+                # defaults
+                # save=False,
+                accept="application/json",
+                contentType="application/json",
+            )
+            return json.loads(response.get("body").read())
+
+        # TODO work though botocore.exceptions to make this catchable.
+        # except botocore.exceptions.ValidationException as e:
+        #     raise HTTPException(status_code=422, detail=str(e)) from e
+
+        except botocore.exceptions.ReadTimeoutError as e:
+            raise AIGatewayException(status_code=408) from e
+
+    async def completions(self, payload: completions.RequestPayload) -> completions.ResponsePayload:
+        from fastapi.encoders import jsonable_encoder
+
+        self.check_for_model_field(payload)
+        payload = jsonable_encoder(payload, exclude_none=True, exclude_defaults=True)
+        payload = self.adapter_class.completions_to_model(payload, self.config)
+        response = self._request(payload)
+        return self.adapter_class.model_to_completions(response, self.config)

genesis_flow-1.0.3/mlflow/genai/datasets/databricks_evaluation_dataset_source.py

@@ -0,0 +1,77 @@
+from typing import Any
+
+from mlflow.data.dataset_source import DatasetSource
+
+
+class DatabricksEvaluationDatasetSource(DatasetSource):
+    """
+    Represents a Databricks Evaluation Dataset source.
+
+    This source is used for datasets managed by the Databricks agents SDK.
+    """
+
+    def __init__(self, table_name: str, dataset_id: str):
+        """
+        Args:
+            table_name: The three-level UC table name of the dataset
+            dataset_id: The unique identifier of the dataset
+        """
+        self._table_name = table_name
+        self._dataset_id = dataset_id
+
+    @property
+    def table_name(self) -> str:
+        """The UC table name of the dataset."""
+        return self._table_name
+
+    @property
+    def dataset_id(self) -> str:
+        """The unique identifier of the dataset."""
+        return self._dataset_id
+
+    @staticmethod
+    def _get_source_type() -> str:
+        return "databricks_evaluation_dataset"
+
+    def load(self, **kwargs) -> Any:
+        """
+        Loads the dataset from the source.
+
+        This method is not implemented as the dataset should be loaded through
+        the databricks.agents.datasets API.
+        """
+        raise NotImplementedError(
+            "Loading a Databricks Evaluation Dataset from source is not supported"
+        )
+
+    @staticmethod
+    def _can_resolve(raw_source: dict[str, Any]) -> bool:
+        """
+        Determines whether the source can be resolved from a dictionary representation.
+        """
+        # Resolution from a dictionary representation is not supported for Databricks Evaluation
+        # Datasets
+        return False
+
+    @classmethod
+    def _resolve(cls, raw_source: dict[str, Any]):
+        """
+        Resolves the source from a dictionary representation.
+        """
+        raise NotImplementedError("Resolution from a source dictionary is not supported")
+
+    def to_dict(self) -> dict[str, Any]:
+        """
+        Returns a dictionary representation of the source.
+        """
+        return {
+            "table_name": self._table_name,
+            "dataset_id": self._dataset_id,
+        }
+
+    @classmethod
+    def from_dict(cls, source_dict: dict[str, Any]) -> "DatabricksEvaluationDatasetSource":
+        """
+        Creates an instance from a dictionary representation.
+        """
+        return cls(table_name=source_dict["table_name"], dataset_id=source_dict["dataset_id"])

{genesis_flow-1.0.0 → genesis_flow-1.0.3}/mlflow/genai/datasets/evaluation_dataset.py

@@ -1,11 +1,14 @@
 from typing import TYPE_CHECKING, Any, Optional, Union
 
 from mlflow.data import Dataset
+from mlflow.data.dataset_source import DatasetSource
 from mlflow.data.digest_utils import compute_pandas_digest
 from mlflow.data.evaluation_dataset import EvaluationDataset as LegacyEvaluationDataset
 from mlflow.data.pyfunc_dataset_mixin import PyFuncConvertibleDatasetMixin
-from mlflow.data.spark_dataset_source import SparkDatasetSource
 from mlflow.entities import Dataset as DatasetEntity
+from mlflow.genai.datasets.databricks_evaluation_dataset_source import (
+    DatabricksEvaluationDatasetSource,
+)
 
 if TYPE_CHECKING:
     import pandas as pd
@@ -56,11 +59,11 @@ class EvaluationDataset(Dataset, PyFuncConvertibleDatasetMixin):
         return self._dataset.profile
 
     @property
-    def source(self) -> Optional[str]:
+    def source(self) -> DatasetSource:
         """Source information for the dataset."""
-        # NB: The managed Dataset entity in Agent SDK doesn't propagate the source
-        # information. So we use the table name as the fallback source.
-        return self._dataset.source or SparkDatasetSource(table_name=self.name)
+        if isinstance(self._dataset.source, DatasetSource):
+            return self._dataset.source
+        return DatabricksEvaluationDatasetSource(table_name=self.name, dataset_id=self.dataset_id)
 
     @property
     def source_type(self) -> Optional[str]:

{genesis_flow-1.0.0 → genesis_flow-1.0.3}/mlflow/genai/scorers/base.py

@@ -35,7 +35,7 @@ class SerializedScorer:
 
     # Builtin scorer fields (for scorers from mlflow.genai.scorers.builtin_scorers)
     builtin_scorer_class: Optional[str] = None
-    builtin_scorer_pydantic_data: Optional[dict[str, Any]] = None
+    builtin_scorer_pydantic_data: Optional[dict] = None
 
     # Decorator scorer fields (for @scorer decorated functions)
     call_source: Optional[str] = None
@@ -43,14 +43,21 @@ class SerializedScorer:
     original_func_name: Optional[str] = None
 
 
-@experimental(version="3.0.0")
+@experimental
 class Scorer(BaseModel):
     name: str
-    aggregations: Optional[list[str]] = None
+    aggregations: Optional[list] = None
+
+    _cached_dump: Optional[dict[str, Any]] = PrivateAttr(default=None)
 
-    def model_dump(self, **kwargs) -> dict[str, Any]:
+    def model_dump(self, **kwargs) -> dict:
         """Override model_dump to include source code."""
         # Create serialized scorer with core fields
+
+        # Return cached dump if available (prevents re-serialization issues with dynamic functions)
+        if self._cached_dump is not None:
+            return self._cached_dump
+
         serialized = SerializedScorer(
             name=self.name,
             aggregations=self.aggregations,
@@ -79,7 +86,7 @@ class Scorer(BaseModel):
 
         return asdict(serialized)
 
-    def _extract_source_code_info(self) -> dict[str, Optional[str]]:
+    def _extract_source_code_info(self) -> dict:
         """Extract source code information for the original decorated function."""
         from mlflow.genai.scorers.scorer_utils import extract_function_body
 
@@ -165,7 +172,13 @@ class Scorer(BaseModel):
         # Rather than serializing and deserializing the `run` method of `Scorer`, we recreate the
         # Scorer using the original function and the `@scorer` decorator. This should be safe so
         # long as `@scorer` is a stable API.
-        return scorer(recreated_func, name=serialized.name, aggregations=serialized.aggregations)
+        scorer_instance = scorer(
+            recreated_func, name=serialized.name, aggregations=serialized.aggregations
+        )
+        # Cache the serialized data to prevent re-serialization issues with dynamic functions
+        original_serialized_data = asdict(serialized)
+        object.__setattr__(scorer_instance, "_cached_dump", original_serialized_data)
+        return scorer_instance
 
     def run(self, *, inputs=None, outputs=None, expectations=None, trace=None):
         from mlflow.evaluation import Assessment as LegacyAssessment
@@ -317,18 +330,13 @@ class Scorer(BaseModel):
         raise NotImplementedError("Implementation of __call__ is required for Scorer class")
 
 
-@experimental(version="3.0.0")
+@experimental
 def scorer(
     func=None,
     *,
     name: Optional[str] = None,
     aggregations: Optional[
-        list[
-            Union[
-                Literal["min", "max", "mean", "median", "variance", "p90", "p99"],
-                Callable[[list[Union[int, float]]], Union[int, float]],
-            ]
-        ]
+        list[Union[Literal["min", "max", "mean", "median", "variance", "p90", "p99"], Callable]]
     ] = None,
 ):
     """
@@ -464,7 +472,7 @@ def scorer(
 
     class CustomScorer(Scorer):
         # Store reference to the original function
-        _original_func: Optional[Callable[..., Any]] = PrivateAttr(default=None)
+        _original_func: Optional[Callable] = PrivateAttr(default=None)
 
         def __init__(self, **data):
             super().__init__(**data)