upgini 1.2.102__py3-none-any.whl → 1.2.103__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.102"
+__version__ = "1.2.103"

upgini/autofe/vector.py

@@ -2,7 +2,7 @@ from typing import List, Optional
 
 import pandas as pd
 
-from upgini.autofe.operator import OperatorRegistry, PandasOperator, VectorizableMixin
+from upgini.autofe.operator import OperatorRegistry, PandasOperator, ParametrizedOperator, VectorizableMixin
 
 
 class Mean(PandasOperator, VectorizableMixin):
@@ -33,13 +33,43 @@ class Vectorize(PandasOperator, VectorizableMixin):
         return pd.DataFrame(data).T.apply(lambda x: x.to_list(), axis=1)
 
 
-class OnnxModel(PandasOperator, metaclass=OperatorRegistry):
+class OnnxModel(PandasOperator, ParametrizedOperator, metaclass=OperatorRegistry):
     name: str = "onnx"
+    score_name: str = "score"
     is_vector: bool = True
     output_type: Optional[str] = "float"
 
+    def to_formula(self) -> str:
+        return f"onnx_{self.score_name}"
 
-class CatboostModel(PandasOperator, metaclass=OperatorRegistry):
+    @classmethod
+    def from_formula(cls, formula: str) -> Optional["OnnxModel"]:
+        if "(" in formula:
+            return None
+        if formula.startswith("onnx_"):
+            score_name = formula[len("onnx_"):]
+            return cls(score_name=score_name)
+        elif formula == "onnx":  # for OperatorRegistry
+            return cls()
+        return None
+
+
+class CatboostModel(PandasOperator, ParametrizedOperator, metaclass=OperatorRegistry):
     name: str = "catboost"
+    score_name: str = "score"
     is_vector: bool = True
     output_type: Optional[str] = "float"
+
+    def to_formula(self) -> str:
+        return f"catboost_{self.score_name}"
+
+    @classmethod
+    def from_formula(cls, formula: str) -> Optional["CatboostModel"]:
+        if "(" in formula:
+            return None
+        if formula.startswith("catboost_"):
+            score_name = formula[len("catboost_"):]
+            return cls(score_name=score_name)
+        elif formula == "catboost":  # for OperatorRegistry
+            return cls()
+        return None

upgini/data_source/data_source_publisher.py

@@ -501,6 +501,7 @@ class DataSourcePublisher:
         input_names: List[str],
         search_id: str,
         date_column: Optional[str] = None,
+        score_name: Optional[str] = None,
         model_type: Optional[Literal["ONNX", "CATBOOST"]] = None,
         description: str = "",
     ):
@@ -510,6 +511,7 @@ class DataSourcePublisher:
             "modelName": name,
             "inputNames": input_names,
             "dateColumn": date_column,
+            "scoreName": score_name,
             "searchTaskId": search_id,
             "modelType": model_type or "ONNX",
             "description": description,

{upgini-1.2.102.dist-info → upgini-1.2.103.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.102
+Version: 1.2.103
 Summary: Intelligent data search & enrichment for Machine Learning
 Project-URL: Bug Reports, https://github.com/upgini/upgini/issues
 Project-URL: Homepage, https://upgini.com/

{upgini-1.2.102.dist-info → upgini-1.2.103.dist-info}/RECORD

@@ -1,4 +1,4 @@
-upgini/__about__.py,sha256=jj5L-hgUqQEc75_6WX-b-0uApNk5XK-w9YuNWlcxc-U,24
+upgini/__about__.py,sha256=I4vADk6bg0T3SScsIWSCnJJu017_FbmnyOgKfo7j6K0,24
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=e6JDYTZ2AwC5aF-dqclKZKkiKrHo2f6cFmMQO2ZZmjM,32724
@@ -21,7 +21,7 @@ upgini/autofe/groupby.py,sha256=IYmQV9uoCdRcpkeWZj_kI3ObzoNCNx3ff3h8sTL01tk,3603
 upgini/autofe/operator.py,sha256=RB3rKMjFi5Cx81RiYXN3OTCuXjmvzmFKQrxn4h0Oclo,5219
 upgini/autofe/unary.py,sha256=FFtvkQaT0cu_zPZ1jCLcsjik-UUh12qQFF3tUW8NqsE,6675
 upgini/autofe/utils.py,sha256=dYrtyAM8Vcc_R8u4dNo54IsGrHKagTHDJTKhGho0bRg,2967
-upgini/autofe/vector.py,sha256=9T7MEUK0SavXIJy0c9Kvu5qTcMtt3fzvdRDBDxcI0JA,1277
+upgini/autofe/vector.py,sha256=r5H6DKT5f3KNjERpV2OOloZ96nDWkModXnpsqw_A77Q,2313
 upgini/autofe/timeseries/__init__.py,sha256=PGwwDAMwvkXl3el12tXVEmZUgDUvlmIPlXtROm6bD18,738
 upgini/autofe/timeseries/base.py,sha256=rWJqRuFAzTZEsUdWG5s1Vhif9zzRRmalASXvarufRxI,3610
 upgini/autofe/timeseries/cross.py,sha256=BTINVwuZSbm_4NKkVm0FGM68SrvZLENZKXN7-UyvhYI,5319
@@ -31,7 +31,7 @@ upgini/autofe/timeseries/roll.py,sha256=zADKXU-eYWQnQ5R3am1yEal8uU6Tm0jLAixwPb_a
 upgini/autofe/timeseries/trend.py,sha256=K1_iw2ko_LIUU8YCUgrvN3n0MkHtsi7-63-8x9er1k4,2129
 upgini/autofe/timeseries/volatility.py,sha256=SvZfhM_ZAWCNpTf87WjSnZsnlblARgruDlu4By4Zvhc,8078
 upgini/data_source/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upgini/data_source/data_source_publisher.py,sha256=YEnjqGW706Od6uTRp9l_TsTuppwSl5jRPZtg50Rngwk,25284
+upgini/data_source/data_source_publisher.py,sha256=XIl69POqrNYxNWOeN6nz6b4aqhDCJlnCJWzmzTyrxNQ,25363
 upgini/mdc/__init__.py,sha256=iHJlXQg6xRM1-ZOUtaPSJqw5SpQDszvxp4LyqviNLIQ,1027
 upgini/mdc/context.py,sha256=3u1B-jXt7tXEvNcV3qmR9SDCseudnY7KYsLclBdwVLk,1405
 upgini/normalizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -71,7 +71,7 @@ upgini/utils/target_utils.py,sha256=i3Xt5l9ybB2_nF_ma5cfPuL3OeFTs2dY2xDI0p4Azpg,
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/ts_utils.py,sha256=26vhC0pN7vLXK6R09EEkMK3Lwb9IVPH7LRdqFIQ3kPs,1383
 upgini/utils/warning_counter.py,sha256=-GRY8EUggEBKODPSuXAkHn9KnEQwAORC0mmz_tim-PM,254
-upgini-1.2.102.dist-info/METADATA,sha256=KgdWy9xo6PzeeUysnqX141kITlcK9hBEH8h_EBa7ioM,49529
-upgini-1.2.102.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-upgini-1.2.102.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.102.dist-info/RECORD,,
+upgini-1.2.103.dist-info/METADATA,sha256=6mwTuyiKQaeFeS-21qj_HWsgeaarwltXivPlDlcDmcI,49529
+upgini-1.2.103.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+upgini-1.2.103.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.103.dist-info/RECORD,,