chalkpy 2.96.8__py3-none-any.whl → 2.97.0__py3-none-any.whl

chalk/_version.py

@@ -1 +1 @@
-__version__ = "2.96.8"
+__version__ = "2.97.0"

chalk/df/LazyFramePlaceholder.py

@@ -566,7 +566,7 @@ class LazyFramePlaceholder:
             columns=columns,
         )
 
-    def select(self, *columns: str, strict: bool = True) -> "LazyFramePlaceholder":
+    def select(self, *columns: str | Underscore, strict: bool = True) -> "LazyFramePlaceholder":
         """Select existing columns by name.
 
         Parameters
@@ -595,7 +595,7 @@ class LazyFramePlaceholder:
             strict=strict,
         )
 
-    def drop(self, *columns: str, strict: bool = True) -> LazyFramePlaceholder:
+    def drop(self, *columns: str | Underscore, strict: bool = True) -> LazyFramePlaceholder:
         """Drop specified columns from the DataFrame.
 
         Parameters
@@ -624,7 +624,7 @@ class LazyFramePlaceholder:
             strict=strict,
         )
 
-    def explode(self, column: str) -> "LazyFramePlaceholder":
+    def explode(self, column: str | Underscore) -> "LazyFramePlaceholder":
         """Explode a list or array column into multiple rows.
 
         Each element in the list becomes a separate row, with other column
@@ -654,7 +654,10 @@ class LazyFramePlaceholder:
     def join(
         self,
         other: "LazyFramePlaceholder",
-        on: dict[str, str] | typing.Sequence[str],
+        *,
+        on: typing.Mapping[str | Underscore, str | Underscore] | typing.Sequence[str | Underscore] | None = None,
+        left_on: typing.Sequence[str | Underscore] | None = None,
+        right_on: typing.Sequence[str | Underscore] | None = None,
         how: str = "inner",
         right_suffix: str | None = None,
     ) -> "LazyFramePlaceholder":
@@ -665,11 +668,29 @@ class LazyFramePlaceholder:
         other
             Right-hand ``DataFrame``.
         on
-            Column names or mapping of left->right join keys.
+            Join keys. Can be specified in multiple ways:
+            - A sequence of column names (same names on both sides): ``on=["col1", "col2"]``
+            - A mapping of left->right column names: ``on={"left_col": "right_col"}``
+            - If None, must specify ``left_on`` and ``right_on`` separately.
+        left_on
+            Column names for left DataFrame join keys. Only used when ``on`` is None.
+            Must be paired with ``right_on``.
+        right_on
+            Column names for right DataFrame join keys. Only used when ``on`` is None.
+            Must be paired with ``left_on``.
         how
-            Join type (e.g. ``"inner"`` or ``"left"``).
+            Join type. Supported values:
+            - ``"inner"``: Keep only rows that match in both DataFrames (default)
+            - ``"left"``: Keep all rows from left DataFrame
+            - ``"right"``: Keep all rows from right DataFrame
+            - ``"outer"`` or ``"full"``: Keep all rows from both DataFrames
+            - ``"semi"``: Return rows from left that have matches in right (no right columns)
+            - ``"anti"``: Return rows from left that have no matches in right
+            - ``"cross"``: Cartesian product (do not pass in ``on``)
         right_suffix
             Optional suffix applied to right-hand columns when names collide.
+            For example, if both DataFrames have a column ``"value"`` and ``right_suffix="_right"``,
+            the result will have ``"value"`` and ``"value_right"``.
 
         Returns
         -------
@@ -681,18 +702,22 @@ class LazyFramePlaceholder:
             function_name="join",
             other=other,
             on=on,
+            left_on=left_on,
+            right_on=right_on,
             how=how,
             right_suffix=right_suffix,
         )
 
     def join_asof(
         self,
-        other: LazyFramePlaceholder,
-        on: str,
+        other: "LazyFramePlaceholder",
         *,
-        right_on: str | None = None,
-        by: list[str] | None = None,
-        right_by: list[str] | None = None,
+        on: str | Underscore | None = None,
+        left_on: str | Underscore | None = None,
+        right_on: str | Underscore | None = None,
+        by: typing.Mapping[str | Underscore, str | Underscore] | typing.Sequence[str | Underscore] | None = None,
+        left_by: typing.Sequence[str | Underscore] | None = None,
+        right_by: typing.Sequence[str | Underscore] | None = None,
         strategy: typing.Literal["forward", "backward"] = "backward",
         right_suffix: str | None = None,
         coalesce: bool = True,
@@ -703,24 +728,41 @@ class LazyFramePlaceholder:
         it matches on the nearest key from the right DataFrame. This is commonly used
         for time-series data where you want to join with the most recent observation.
 
-        **Important**: Both DataFrames must be sorted by the ``on`` column before calling
-        this method. Use ``.order_by(on)`` to sort if needed.
+        **Important**: Both DataFrames must be sorted by the ``on`` (or ``left_on/right_on``)
+        column before calling this method. Use ``.order_by(on)`` to sort if needed.
 
         Parameters
         ----------
         other
             Right-hand DataFrame to join with.
         on
-            Column name in the left DataFrame to join on (must be sorted).
+            Column name to use as the as-of join key (must be sorted).
+            This column is used for both left and right DataFrames.
+            The join finds the nearest match according to the ``strategy``.
+            Either ``on`` or both ``left_on`` and ``right_on`` must be specified.
+        left_on
+            Column name in left DataFrame for the as-of join key. Only used when ``on``
+            is None. Must be paired with ``right_on``.
         right_on
-            Column name in the right DataFrame to join on. If None, uses ``on``.
+            Column name in right DataFrame for the as-of join key. Can be used with ``on``
+            (to specify a different right column name) or with ``left_on`` (when ``on`` is None).
         by
-            Additional exact-match columns for left DataFrame (optional).
+            Additional exact-match columns (optional). These columns must match exactly
+            before performing the as-of match on the ``on`` column. Can be specified as:
+            - A sequence of column names (same names on both sides): ``by=["col1", "col2"]``
+            - A mapping of left->right column names: ``by={"left_col": "right_col"}``
+            - If None, can specify ``left_by`` and ``right_by`` separately.
+        left_by
+            Column names in left DataFrame for exact-match conditions. Only used when
+            ``by`` is None. Must be paired with ``right_by``.
         right_by
-            Additional exact-match columns for right DataFrame. If None, uses ``by``.
+            Column names in right DataFrame for exact-match conditions. Only used when
+            ``by`` is None. Must be paired with ``left_by``.
         strategy
-            Join strategy - "backward" (default) matches with the most recent past value,
-            "forward" matches with the nearest future value. Can also pass AsOfJoinStrategy enum.
+            Join strategy controlling which match to select:
+            - ``"backward"`` (default): Match with the most recent past value
+            - ``"forward"``: Match with the nearest future value
+            Can also pass ``AsOfJoinStrategy.BACKWARD`` or ``AsOfJoinStrategy.FORWARD``.
         right_suffix
             Suffix to add to overlapping column names from the right DataFrame.
         coalesce
@@ -737,8 +779,10 @@ class LazyFramePlaceholder:
             function_name="join_asof",
             other=other,
             on=on,
+            left_on=left_on,
             right_on=right_on,
             by=by,
+            left_by=left_by,
             right_by=right_by,
             strategy=strategy,
             right_suffix=right_suffix,
@@ -748,13 +792,13 @@ class LazyFramePlaceholder:
     # # Window is not yet supported in LazyFramePlaceholder:
     # def window(
     #     self,
-    #     by: typing.Sequence[str],
-    #     order_by: typing.Sequence[str | tuple[str, str]],
+    #     by: typing.Sequence[str | Underscore],
+    #     order_by: typing.Sequence[str | Underscore | tuple[str | Underscore, str]],
     #     *expressions: WindowExpr,
     # ) -> LazyFramePlaceholder:
     #     ...
 
-    def agg(self, by: typing.Sequence[str], *aggregations: Underscore) -> "LazyFramePlaceholder":
+    def agg(self, by: typing.Sequence[str | Underscore], *aggregations: Underscore) -> "LazyFramePlaceholder":
         """Group by columns and apply aggregation expressions.
 
         Parameters
@@ -785,7 +829,7 @@ class LazyFramePlaceholder:
             args=(by, *aggregations),
         )
 
-    def distinct_on(self, *columns: str) -> "LazyFramePlaceholder":
+    def distinct_on(self, *columns: str | Underscore) -> "LazyFramePlaceholder":
         """Remove duplicate rows based on specified columns.
 
         For rows with identical values in the specified columns, only one
@@ -813,7 +857,7 @@ class LazyFramePlaceholder:
             args=columns,
         )
 
-    def order_by(self, *columns: str | tuple[str, str]) -> LazyFramePlaceholder:
+    def order_by(self, *columns: str | Underscore | tuple[str | Underscore, str]) -> LazyFramePlaceholder:
         """Sort the DataFrame by one or more columns.
 
         Parameters
@@ -889,7 +933,7 @@ class LazyFramePlaceholder:
             connector_id=connector_id,
         )
 
-    def rename(self, new_names: dict[str, str]) -> LazyFramePlaceholder:
+    def rename(self, new_names: typing.Mapping[str | Underscore, str]) -> LazyFramePlaceholder:
         """Rename columns in the DataFrame.
 
         Parameters

chalk/features/resolver.py

@@ -4588,7 +4588,7 @@ def validate_message_attributes(
 def make_model_resolver(
     name: str,
     model: "ModelVersion",
-    inputs: Dict[Feature, str] | List[Feature],
+    input: Dict[Feature, str] | List[Feature],
     output: Feature | List[Feature] | Dict[Feature, str],
     feature_class: Optional[type[Features]] = None,
     resource_group: Optional[str] = None,
@@ -4656,7 +4656,7 @@ def make_model_resolver(
     >>> resolver = make_model_resolver(
     ...     name="risk_model",
     ...     model=model,
-    ...     inputs=[User.age, User.income],
+    ...     input=[User.age, User.income],
     ...     output=User.risk_score,
     ... )
     >>>
@@ -4664,7 +4664,7 @@ def make_model_resolver(
     >>> resolver = make_model_resolver(
     ...     name="multi_output_model",
     ...     model=model,
-    ...     inputs=[User.age, User.income],
+    ...     input=[User.age, User.income],
     ...     output=[User.risk_score, User.credit_score],
     ... )
     >>>
@@ -4672,16 +4672,16 @@ def make_model_resolver(
     >>> resolver = make_model_resolver(
     ...     name="named_model",
     ...     model=model,
-    ...     inputs={User.age: "age_input", User.income: "income_input"},
+    ...     input={User.age: "age_input", User.income: "income_input"},
     ...     output={User.risk_score: "risk_output", User.credit_score: "credit_output"},
     ... )
     """
     from chalk.features.inference import build_inference_function
 
-    if isinstance(inputs, dict):
-        input_features_raw = list(inputs.keys())
+    if isinstance(input, dict):
+        input_features_raw = list(input.keys())
     else:
-        input_features_raw = inputs
+        input_features_raw = input
 
     input_features = [unwrap_feature(f) for f in input_features_raw]
 

{chalkpy-2.96.8.dist-info → chalkpy-2.97.0.dist-info}/METADATA

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

{chalkpy-2.96.8.dist-info → chalkpy-2.97.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 chalk/__init__.py,sha256=vKsx9-cl5kImlVWGHVRYO6bweBm79NAzGs3l36u71wM,2657
-chalk/_version.py,sha256=XQBn2m_TF6iSSjpgoPtUzJ93WpjTyMNEkfPlAWxDliQ,23
+chalk/_version.py,sha256=AzuYEr2BkAnDfw_LTLHrqH9MJasLCRVWoZmn_HmxL2s,23
 chalk/cli.py,sha256=ckqqfOI-A2mT23-rnZzDMmblYj-2x1VBX8ebHlIEn9A,5873
 chalk/importer.py,sha256=m4lMn1lSYj_euDq8CS7LYTBnek9JOcjGJf9-82dJHbA,64441
 chalk/prompts.py,sha256=2H9UomLAamdfRTNUdKs9i3VTpiossuyRhntqsAXUhhg,16117
@@ -636,7 +636,7 @@ chalk/config/_validator.py,sha256=QC1y52m704_bV_TYjq0sdZJ-km8iSkDX1V4sHgw4RJk,13
 chalk/config/auth_config.py,sha256=HAALkQrvDD0i7gaZK5iufS8vDDVbzLIpHLOpcJO1kmw,4498
 chalk/config/project_config.py,sha256=YHB3upvtBJu-tWfNOchBRSc9xGebDbrIpCVmKbBzJ8Q,7217
 chalk/df/ChalkDataFrameImpl.py,sha256=BRwnjQcie3gxaKhKau8HG17NWzS1zdr8SnNVurxF8QY,133
-chalk/df/LazyFramePlaceholder.py,sha256=D4oYEGPfoxpJMmyiDJq3G9Wfl1jF3XSXD71q-GxOrmQ,39398
+chalk/df/LazyFramePlaceholder.py,sha256=6MGwaQRMvgOOqSRl7NC_BsRkiFfzH7eX-ylGH-biNsU,42562
 chalk/df/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chalk/df/ast_parser.py,sha256=t-DwUxd2hN8LECRSBx85DIv9FtILgMiHyGyCTINfgQw,11199
 chalk/features/__init__.py,sha256=5doD7bFwRthzwdmizbRaPVHiCABiNpiOiAJVFlwqNnA,6943
@@ -660,7 +660,7 @@ chalk/features/live_updates.py,sha256=8ZbiDjcLqfFruSL15_aycwzSqJ0TbKNhas06KfZLyL
 chalk/features/namespace_context.py,sha256=fL-nPohqtNiyPDS1uQTAaHLns4aivuBL2Flf50DajU4,1813
 chalk/features/primary.py,sha256=BZ8mrMmKfRNy_wnKGDJt2cdnejP_CZb6xBsD9Ljgajc,5209
 chalk/features/pseudofeatures.py,sha256=50Pe_Xi8ttYWtgNNRpgkhBxP8xoCZCYwyLb0aWUQ-PI,2147
-chalk/features/resolver.py,sha256=dSDBxWyUOBXH1KBsuNdDuq928Yg-XRNc9a8WWc9p3D8,193549
+chalk/features/resolver.py,sha256=txAhcTv60QHn5Ge0Hr1z2LSWVKNDuZZYSogTnY31YMA,193542
 chalk/features/tag.py,sha256=LRmKRA8ANCOvmaIAk-L5j1QW2U0aah2SeASy8Uydkmk,2675
 chalk/features/underscore.py,sha256=4xnfQV3bfvVn0PNEtkT4J-k7hW4ebtH9KBe4_BvGjY4,26763
 chalk/features/underscore_features.py,sha256=PlVCoaDDffOgtiSMaxPSWCoj8IjscbkOzDLA471HsJ4,13005
@@ -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.96.8.dist-info/METADATA,sha256=wLMi2G7i8tczLoHoAAYiMWG9g2oujf4DoUmq3hqkP98,27754
-chalkpy-2.96.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-chalkpy-2.96.8.dist-info/entry_points.txt,sha256=Vg23sd8icwq-morJrljVFr-kQnMbm95rZfZj5wsZGis,42
-chalkpy-2.96.8.dist-info/top_level.txt,sha256=1Q6_19IGYfNxSw50W8tYKEJ2t5HKQ3W9Wiw4ia5yg2c,6
-chalkpy-2.96.8.dist-info/RECORD,,
+chalkpy-2.97.0.dist-info/METADATA,sha256=MAiYY-F0FLqqxH6fDhU2KpF3FL38NqmMJJoCiVq8bSY,27754
+chalkpy-2.97.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+chalkpy-2.97.0.dist-info/entry_points.txt,sha256=Vg23sd8icwq-morJrljVFr-kQnMbm95rZfZj5wsZGis,42
+chalkpy-2.97.0.dist-info/top_level.txt,sha256=1Q6_19IGYfNxSw50W8tYKEJ2t5HKQ3W9Wiw4ia5yg2c,6
+chalkpy-2.97.0.dist-info/RECORD,,