chalkpy 2.98.2__py3-none-any.whl → 2.98.4__py3-none-any.whl

chalk/_version.py

@@ -1 +1 @@
-__version__ = "2.98.2"
+__version__ = "2.98.4"

chalk/client/client.py

@@ -63,7 +63,7 @@ if TYPE_CHECKING:
 from chalk.features._encoding.json import FeatureEncodingOptions
 from chalk.features.resolver import Resolver
 from chalk.features.tag import BranchId, DeploymentId, EnvironmentId
-from chalk.ml import ModelEncoding, ModelRunCriterion, ModelType
+from chalk.ml import ModelClass, ModelEncoding, ModelRunCriterion, ModelType
 from chalk.parsed.branch_state import BranchGraphSummary
 from chalk.prompts import Prompt
 
@@ -2271,6 +2271,7 @@ class ChalkClient:
         self,
         name: str,
         model_type: Optional[ModelType] = None,
+        model_class: Optional[ModelClass] = None,
         model_encoding: Optional[ModelEncoding] = None,
         aliases: Optional[List[str]] = None,
         model: Optional[Any] = None,

chalk/client/client_impl.py

@@ -162,7 +162,7 @@ from chalk.features.pseudofeatures import CHALK_TS_FEATURE
 from chalk.features.resolver import Resolver, StreamResolver
 from chalk.features.tag import BranchId, DeploymentId, EnvironmentId
 from chalk.importer import CHALK_IMPORT_FLAG
-from chalk.ml import ModelEncoding, ModelRunCriterion, ModelType
+from chalk.ml import ModelClass, ModelEncoding, ModelRunCriterion, ModelType
 from chalk.ml.model_file_transfer import SourceConfig
 from chalk.parsed._proto.utils import encode_proto_to_b64
 from chalk.parsed.branch_state import BranchGraphSummary
@@ -5270,6 +5270,7 @@ https://docs.chalk.ai/cli/apply
         self,
         name: str,
         model_type: Optional[ModelType] = None,
+        model_class: Optional[ModelClass] = None,
         model_encoding: Optional[ModelEncoding] = None,
         aliases: Optional[List[str]] = None,
         model: Optional[Any] = None,
@@ -5296,6 +5297,7 @@ https://docs.chalk.ai/cli/apply
             name=name,
             aliases=aliases,
             model_type=model_type,
+            model_class=model_class,
             model_encoding=model_encoding,
             model=model,
             model_paths=model_paths,

chalk/operators/_utils.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 import dataclasses
 import traceback
-from typing import Callable, Optional, Sequence, Union
+from typing import Callable, Optional, Protocol, Sequence, TypeVar, Union
 
 import pyarrow
 
 from chalk import DataFrame, Features, StaticOperator
+from chalk._gen.chalk.dataframe.v1 import dataframe_pb2
 from chalk._gen.chalk.expression.v1 import expression_pb2 as expr_pb
 from chalk.client import ChalkError, ChalkException, ErrorCode, ErrorCodeCategory
 from chalk.df.LazyFramePlaceholder import LazyFramePlaceholder
@@ -40,6 +41,14 @@ class _GetStaticOperatorError(Exception):
         )
 
 
+ProtoT = TypeVar("ProtoT", covariant=True)
+
+
+class _ToProto(Protocol[ProtoT]):
+    def _to_proto(self) -> ProtoT:
+        ...
+
+
 @dataclasses.dataclass
 class DfPlaceholder:
     schema_dict: dict[str, pyarrow.DataType]
@@ -80,7 +89,7 @@ def static_resolver_to_operator(
     fn: Callable,
     inputs: Sequence[Union[Feature, type[DataFrame]]],
     output: Optional[type[Features]],
-) -> StaticOperator | DfPlaceholder | ChalkDataFrame | LazyFramePlaceholder:
+) -> StaticOperator | DfPlaceholder | ChalkDataFrame | _ToProto[dataframe_pb2.DataFramePlan]:
     if output is None:
         raise _GetStaticOperatorError(
             resolver_fqn=fqn,

chalk/parsed/to_proto.py

@@ -16,12 +16,13 @@ from typing_extensions import assert_never
 
 from chalk import DataFrame
 from chalk._gen.chalk.arrow.v1 import arrow_pb2 as arrow_pb
+from chalk._gen.chalk.dataframe.v1.dataframe_pb2 import DataFramePlan
 from chalk._gen.chalk.expression.v1 import expression_pb2 as expr_pb
+from chalk._gen.chalk.expression.v1.expression_pb2 import LogicalExprNode
 from chalk._gen.chalk.graph.v1 import graph_pb2 as pb
 from chalk._gen.chalk.graph.v2 import sources_pb2 as sources_pb
 from chalk._gen.chalk.lsp.v1.lsp_pb2 import Location, Position, Range
 from chalk._validation.feature_validation import FeatureValidation
-from chalk.df.LazyFramePlaceholder import LazyFramePlaceholder
 from chalk.features import (
     CacheStrategy,
     Feature,
@@ -1154,10 +1155,11 @@ class ToProtoConverter:
         static_operation_dataframe = None
         if r.static:
             static_operator = static_resolver_to_operator(fqn=r.fqn, fn=r.fn, inputs=r.inputs, output=r.output)
-            if isinstance(static_operator, LazyFramePlaceholder):
-                static_operation_dataframe = static_operator._to_proto()  # pyright: ignore[reportPrivateUsage]
-            else:
-                static_operation = static_operator._to_proto()  # pyright: ignore[reportPrivateUsage]
+            to_proto = static_operator._to_proto()  # pyright: ignore[reportPrivateUsage]
+            if isinstance(to_proto, DataFramePlan):
+                static_operation_dataframe = to_proto
+            elif isinstance(to_proto, LogicalExprNode):  # pyright: ignore[reportUnnecessaryIsInstance]
+                static_operation = to_proto
 
         function_reference_proto = ToProtoConverter.create_function_reference(
             r.fn,

{chalkpy-2.98.2.dist-info → chalkpy-2.98.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chalkpy
-Version: 2.98.2
+Version: 2.98.4
 Summary: Python SDK for Chalk
 Author: Chalk AI, Inc.
 Project-URL: Homepage, https://chalk.ai

{chalkpy-2.98.2.dist-info → chalkpy-2.98.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 chalk/__init__.py,sha256=vKsx9-cl5kImlVWGHVRYO6bweBm79NAzGs3l36u71wM,2657
-chalk/_version.py,sha256=7Cc2OCS4iZEpzdq7iHwkSLQA8S6psTq-SKpiAAtUbG0,23
+chalk/_version.py,sha256=dEzljEJtCL38cLmlHSmH5pTwojeTArPqqy8VF1ezkbo,23
 chalk/cli.py,sha256=ckqqfOI-A2mT23-rnZzDMmblYj-2x1VBX8ebHlIEn9A,5873
 chalk/importer.py,sha256=m4lMn1lSYj_euDq8CS7LYTBnek9JOcjGJf9-82dJHbA,64441
 chalk/prompts.py,sha256=2H9UomLAamdfRTNUdKs9i3VTpiossuyRhntqsAXUhhg,16117
@@ -612,11 +612,11 @@ chalk/_validation/validation.py,sha256=9cCMfZa9-1wxkXLme_ylmD5vIA1qExJD6aqbYvbmK
 chalk/byte_transmit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chalk/byte_transmit/model.py,sha256=LFX8pj9X_CWXeap7fDnMl9YmXsYTgq7jBAbEWkxoYoE,13048
 chalk/client/__init__.py,sha256=wu3WQVzE5gRj6noQQDOdYJUgDaz_9QtbjXH4KuoIlXQ,1782
-chalk/client/client.py,sha256=DcRJltVqWy_B3Qvbnjz3qOECT9TZ7KD0eovds2CNRIw,104746
+chalk/client/client.py,sha256=VfaLfbWyk-VaImPLNrNeAP4FvuJwQ5yEtJrkLST_-H4,104808
 chalk/client/client_async.py,sha256=YmuExumlDkenlGc8ROtmPjUE2m6nQUZisUDvJmwTRdk,51546
 chalk/client/client_async_impl.py,sha256=ZphhgTB49JBWHCGXe-dI0wWWKc9zPcOczy02q_gFy50,6925
 chalk/client/client_grpc.py,sha256=z1WeFWjmKKCU8dK7fdvWEOsCUlBi-v_2-HijC2_oIVs,108854
-chalk/client/client_impl.py,sha256=m2-dovRppOchuEwt2LlKJAv0LBW5obs9ztuJeDhuqY0,213660
+chalk/client/client_impl.py,sha256=L0qE7Gr5MTMv71lg7-HkoPS672eERGVsfu8FObM_ZyQ,213759
 chalk/client/dataset.py,sha256=LneWwaAOHCjtj7gaJjsSeVNruj-QJ51hjRi62zrFNVE,77561
 chalk/client/exc.py,sha256=kZJ80YbSeSRDmTLTh240j_eRdJFZBa7IaDsNSRoDroU,4145
 chalk/client/models.py,sha256=TWiRHDMP_9NUqlCAGaw2RI2UlFI5ED1BCBM1rZRK72k,67482
@@ -718,7 +718,7 @@ chalk/operators/_literal.py,sha256=T8Euf2HRUVlFuct3svX4Z8EVf80r0cWDBZGr0MUgS9Q,5
 chalk/operators/_parquet_scan.py,sha256=3pSd1U-9My145GO1Nr1P_T2SfdhPZW2PLeMvKg6l4Uo,545
 chalk/operators/_rename.py,sha256=YgpMnfYsln88gfp4AwhiI8JX58hadDvEcFYrMCcVl1o,741
 chalk/operators/_select.py,sha256=0vXxnlSlp5DVnO7WcjJJuDb8jnwRtyVyVbdP_U4gtYs,1029
-chalk/operators/_utils.py,sha256=7NRUNqFoJoFCTEbAJs4H98KRbDJshwN0RoyjPfmyzN8,5050
+chalk/operators/_utils.py,sha256=WZRYAlK3M_w5k_4tyqg0AzR1cntqfaR7upNmia-g6z4,5270
 chalk/parsed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chalk/parsed/_graph_validation.py,sha256=XHVPw4cf-nkPdHrqGXevsFuOrMtWtibUTRkTuizEc4g,23771
 chalk/parsed/_metadata.py,sha256=TCjKr20Fs4Yguo97yKjATurwOdV-DoFQeiGxbX_s1hs,6749
@@ -727,7 +727,7 @@ chalk/parsed/branch_state_rich.py,sha256=X9st1vRMRMOfnEy3hwitsAyNcTzZlubXJt9jI1M
 chalk/parsed/duplicate_input_gql.py,sha256=IbVRKDCS-M7f9k127LpeVjRlXvzp1tuIek-bOqTULC4,20196
 chalk/parsed/expressions.py,sha256=A8U54v9jacLX4UVtLqSUYUjL-lOnI-kWvG2hHZvfYE0,554
 chalk/parsed/json_conversions.py,sha256=GRBg2KvwahP1tXwr7n--s7ueULN6prEDPO2I9B9MWzk,30459
-chalk/parsed/to_proto.py,sha256=ZSwEYkuwr3UhMVabt6FM02fBN_oBy_mSMjDYS_crJw0,75530
+chalk/parsed/to_proto.py,sha256=JsMnLlkXL1KH4LxZJStkwBHOB2geG9hnO3ku4LTl3vU,75657
 chalk/parsed/user_types_to_json.py,sha256=ZJWdYFqyhr5InvItQybtHadXQjW3vjHrv8hjMGtL3Bc,13318
 chalk/parsed/validation_from_registries.py,sha256=nfiAj1tvWRu0RrkhkGtElhAsL8V7ayEKUisrKQF-wYc,7900
 chalk/parsed/_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -827,8 +827,8 @@ chalk/utils/tracing.py,sha256=NiiM-9dbuJhSCv6R1npR1uYNKWlkqTR6Ygm0Voi2NrY,13078
 chalk/utils/weak_set_by_identity.py,sha256=VmikA_laYwFeOphCwXJIuyOIkrdlQe0bSzaXq7onoQw,953
 chalk/utils/pydanticutil/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chalk/utils/pydanticutil/pydantic_compat.py,sha256=O575lLYJ5GvZC4HMzR9yATxf9XwjC6NrDUXbNwZidlE,3031
-chalkpy-2.98.2.dist-info/METADATA,sha256=iROjKSQYMlH8Dfat6xKGCMx7ymmRV7SvKhEK_yGolb8,27754
-chalkpy-2.98.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-chalkpy-2.98.2.dist-info/entry_points.txt,sha256=Vg23sd8icwq-morJrljVFr-kQnMbm95rZfZj5wsZGis,42
-chalkpy-2.98.2.dist-info/top_level.txt,sha256=1Q6_19IGYfNxSw50W8tYKEJ2t5HKQ3W9Wiw4ia5yg2c,6
-chalkpy-2.98.2.dist-info/RECORD,,
+chalkpy-2.98.4.dist-info/METADATA,sha256=A7vXH5sot4cUwTZRmRIJoNCUz6UciNohn3Xvitpuqgk,27754
+chalkpy-2.98.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+chalkpy-2.98.4.dist-info/entry_points.txt,sha256=Vg23sd8icwq-morJrljVFr-kQnMbm95rZfZj5wsZGis,42
+chalkpy-2.98.4.dist-info/top_level.txt,sha256=1Q6_19IGYfNxSw50W8tYKEJ2t5HKQ3W9Wiw4ia5yg2c,6
+chalkpy-2.98.4.dist-info/RECORD,,