upgini 1.2.65a3818.dev5__py3-none-any.whl → 1.2.65a3818.dev6__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.65a3818.dev5"
+__version__ = "1.2.65a3818.dev6"

upgini/autofe/feature.py

@@ -6,7 +6,7 @@ import numpy as np
 import pandas as pd
 from pandas._typing import DtypeObj
 
-from upgini.autofe.all_operands import find_op
+from upgini.autofe.all_operators import find_op
 from upgini.autofe.operator import Operator, PandasOperator
 
 
@@ -112,7 +112,7 @@ class Feature:
 
     def get_hash(self) -> str:
         return hashlib.sha256(
-            "_".join([self.op.to_formula()] + [ch.get_display_name() for ch in self.children]).encode("utf-8")
+            "_".join([self.op.get_hash_component()] + [ch.get_display_name() for ch in self.children]).encode("utf-8")
         ).hexdigest()[:8]
 
     def set_alias(self, alias: str) -> "Feature":

upgini/autofe/operator.py

@@ -76,6 +76,9 @@ class Operator(BaseModel, metaclass=OperatorRegistry):
     def to_formula(self) -> str:
         return self.name
 
+    def get_hash_component(self) -> str:
+        return self.to_formula()
+
 
 class ParametrizedOperator(Operator, abc.ABC):
 

upgini/autofe/timeseries/cross.py

@@ -8,7 +8,7 @@ try:
 except ImportError:
     from pydantic import validator  # V1
 
-from upgini.autofe.all_operands import find_op
+from upgini.autofe.all_operators import find_op
 from upgini.autofe.operator import PandasOperator, ParametrizedOperator
 from upgini.autofe.timeseries.base import TimeSeriesBase
 
@@ -95,6 +95,15 @@ class CrossSeriesInteraction(TimeSeriesBase, ParametrizedOperator):
         )
         return res
 
+    def get_hash_component(self) -> str:
+        inner_components = [
+            self.to_formula(),
+            "_".join(str(i) for i in self.descriptor_indices),
+            "_".join(self.left_descriptor),
+            "_".join(self.right_descriptor),
+        ]
+        return "_".join(inner_components)
+
     def _get_interaction_op_name(self) -> str:
         return self.interaction_op.alias or self.interaction_op.to_formula()
 

{upgini-1.2.65a3818.dev5.dist-info → upgini-1.2.65a3818.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.65a3818.dev5
+Version: 1.2.65a3818.dev6
 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.65a3818.dev5.dist-info → upgini-1.2.65a3818.dev6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-upgini/__about__.py,sha256=WOd200tkoJAB3TJo-txEZDg-U6YHThQugeQsJTyxs64,33
+upgini/__about__.py,sha256=eiDtjiIjMsBgSWrJJikBsClurYrFLD_AmN8JsBwM_Zs,33
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=OGjpeFHbj3lWiZTOHTpWEoMMDmFY1FlNC44FKktoZvU,34956
@@ -14,17 +14,17 @@ upgini/version_validator.py,sha256=DvbaAvuYFoJqYt0fitpsk6Xcv-H1BYDJYHUMxaKSH_Y,1
 upgini/ads_management/__init__.py,sha256=qzyisOToVRP-tquAJD1PblZhNtMrOB8FiyF9JvfkvgE,50
 upgini/ads_management/ads_manager.py,sha256=igVbN2jz80Umb2BUJixmJVj-zx8unoKpecVo-R-nGdw,2648
 upgini/autofe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upgini/autofe/all_operands.py,sha256=rdjF5eaE4bC6Q4eu_el5Z7ekYt8DjOFermz2bePPbUc,333
+upgini/autofe/all_operators.py,sha256=rdjF5eaE4bC6Q4eu_el5Z7ekYt8DjOFermz2bePPbUc,333
 upgini/autofe/binary.py,sha256=MnQuFiERpocjCPQUjOljlsq5FE-04GPfwtNjzvfNMyU,7671
 upgini/autofe/date.py,sha256=I07psJerrxOcHao91PdSCk9X6KWu61IBVyFRLjGNgK8,10730
-upgini/autofe/feature.py,sha256=Xto7FHH1JG-5QvkfTPNWKtV9GAzPviTNPKFZOUN7RQA,14757
+upgini/autofe/feature.py,sha256=xgu6bVIlUJ5PCUgoXQRNcGkcMOhj-_BdDRmkB_qRFS4,14766
 upgini/autofe/groupby.py,sha256=IYmQV9uoCdRcpkeWZj_kI3ObzoNCNx3ff3h8sTL01tk,3603
-upgini/autofe/operator.py,sha256=KKLFixtEFq-qP6WVks19F0AY2iOnB8_g8uYpbrC8USM,4894
+upgini/autofe/operator.py,sha256=EOffJw6vKXpEh5yymqb1RFNJPxGxmnHdFRo9dB5SCFo,4969
 upgini/autofe/unary.py,sha256=yVgPvtfnPSOhrii0YgezddmgWPwyOBCR0JutaIkdTTc,4658
 upgini/autofe/vector.py,sha256=l0KdKg-txlZxDSE4hPPfCtfGQofYbl7oaABPr830sPI,667
 upgini/autofe/timeseries/__init__.py,sha256=PGwwDAMwvkXl3el12tXVEmZUgDUvlmIPlXtROm6bD18,738
 upgini/autofe/timeseries/base.py,sha256=T9Ec8LKJbiwTUGGsd_xhM0U0NUJblqmKchkzUI1sK88,3755
-upgini/autofe/timeseries/cross.py,sha256=8ggDhsvwdxHkrWKRPl2fcFt7wamTYhkVzQcOWvIIyvU,4612
+upgini/autofe/timeseries/cross.py,sha256=u0VpTyul_vrOgPD2yptq0jElxDULwH4YPCVBvWnl4WM,4919
 upgini/autofe/timeseries/delta.py,sha256=h0YhmI1TlPJnjwFpN_GQxLb6r59DQuucnG5tQAXSgjU,3520
 upgini/autofe/timeseries/lag.py,sha256=LfQtg484vuqM0mgY4Wft1swHX_Srq7OKKgZswCXoiXI,1882
 upgini/autofe/timeseries/roll.py,sha256=bNFMDszSYTWvB7EyhHbRY1DJqzSURvHlPAcBebt0y0Y,2878
@@ -70,7 +70,7 @@ upgini/utils/target_utils.py,sha256=b1GzO8_gMcwXSZ2v98CY50MJJBzKbWHId_BJGybXfkM,
 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.65a3818.dev5.dist-info/METADATA,sha256=ThM2VKSF3JJw-jQz1wSWOQh81T7FsB4FvnjB5r9bcKk,49123
-upgini-1.2.65a3818.dev5.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.2.65a3818.dev5.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.65a3818.dev5.dist-info/RECORD,,
+upgini-1.2.65a3818.dev6.dist-info/METADATA,sha256=4YxJ7EhfeMqfyIoiS0bBmxG-sWIF5ItjlIGLFgrugTA,49123
+upgini-1.2.65a3818.dev6.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.2.65a3818.dev6.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.65a3818.dev6.dist-info/RECORD,,