upgini 1.1.291a3232.post3__py3-none-any.whl → 1.1.292__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.1.291a3232-3"
+__version__ = "1.1.292"

upgini/autofe/unary.py

@@ -114,15 +114,14 @@ class Freq(PandasOperand):
         return self._loc(data, value_counts)
 
 
-class Norm(PandasOperand, VectorizableMixin):
+class Norm(PandasOperand):
     name = "norm"
     is_unary = True
     output_type = "float"
 
     def calculate_unary(self, data: pd.Series) -> pd.Series:
-        normalized_data = Normalizer().transform(data.to_frame().T).T
-        return pd.Series(normalized_data[:, 0], index=data.index, name=data.name)
-
-    def calculate_group(self, data: pd.DataFrame, **kwargs) -> pd.DataFrame:
-        normalized_data = Normalizer().transform(data.T).T
-        return pd.DataFrame(normalized_data, index=data.index, columns=data.columns)
+        data_dropna = data.dropna()
+        normalized_data = Normalizer().transform(data_dropna.to_frame().T).T
+        normalized_data = pd.Series(normalized_data[:, 0], index=data_dropna.index, name=data.name)
+        normalized_data = normalized_data.reindex(data.index)
+        return normalized_data

upgini/data_source/data_source_publisher.py

@@ -347,3 +347,29 @@ class DataSourcePublisher:
             self.upload_online(search_keys=keys)
 
         print("All ADS-es successfully uploaded")
+
+    def union_search_tasks(
+        self,
+        search_ids: List[str],
+        target_user_email: str,
+        selected_features: Optional[List[str]] = None,
+        exclude_features: Optional[List[str]] = None,
+    ) -> str:
+        if not search_ids:
+            raise Exception("Empty search ids list")
+
+        if not target_user_email:
+            raise Exception("Empty target user email")
+
+        request = {
+            "search_task_ids": search_ids,
+            "target_user_email": target_user_email,
+        }
+        if selected_features:
+            request["selected_features"] = selected_features
+        if exclude_features:
+            request["exclude_features"] = exclude_features
+
+        response = self._rest_client.union_search_tasks(request, "trace_id")
+        print(response)
+        return response

upgini/http.py

@@ -291,6 +291,7 @@ class _RestClient:
     GET_ACTIVE_ADS_DEFINITIONS_URI = "private/api/v2/ads/definitions"
     UPLOAD_ONLINE_URI = "private/api/v2/ads/upload-online"
     STOP_ADS_MANAGEMENT_TASK_URI_FMT = "private/api/v2/ads/management-task/{0}/stop"
+    UNION_SEARCH_TASKS_URI_FMT = SERVICE_ROOT_V2 + "search/merge"
 
     ACCESS_TOKEN_HEADER_NAME = "Authorization"
     CONTENT_TYPE_HEADER_NAME = "Content-Type"
@@ -760,6 +761,10 @@ class _RestClient:
         api_path = self.STOP_ADS_MANAGEMENT_TASK_URI_FMT.format(ads_management_task_id)
         self._with_unauth_retry(lambda: self._send_post_req(api_path, trace_id))
 
+    def union_search_tasks(self, request: dict, trace_id: str):
+        api_path = self.UNION_SEARCH_TASKS_URI_FMT
+        return self._with_unauth_retry(lambda: self._send_post_req(api_path, trace_id, request, result_format=None))
+
     # ---
 
     def _send_get_req(self, api_path: str, trace_id: Optional[str], additional_headers: Optional[dict] = None):

{upgini-1.1.291a3232.post3.dist-info → upgini-1.1.292.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.1.291a3232.post3
+Version: 1.1.292
 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.1.291a3232.post3.dist-info → upgini-1.1.292.dist-info}/RECORD

@@ -1,10 +1,10 @@
-upgini/__about__.py,sha256=cRF02lu4xw6jygI8-Pm-EKge0Js7vS1ywPBBNcxhPus,31
+upgini/__about__.py,sha256=ftI-AhPhhGVokbUGBIG7BOU1TcKcaEDEyviqLQdHimM,24
 upgini/__init__.py,sha256=asENHgEVHQBIkV-e_0IhE_ZWqkCG6398U3ZLrNzAH6k,407
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=7TLVVhGtjgx_9yaiaIUK3kZSe_R9wg5dY0d4F5qCGM4,45636
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
 upgini/features_enricher.py,sha256=Bfqbzqj3h1Ox3s6hBA4UYXkG7hQDqGPB4JK1YXtxXxw,177530
-upgini/http.py,sha256=khrYSldpY-HbVLCcApfV1BjBFK6Uyuatb4colKybxgY,42301
+upgini/http.py,sha256=bp6jWl422Icy3AhHMdCcJv5NjExE45gSMmzMTPJjPuk,42600
 upgini/metadata.py,sha256=qDAIO7NLSSQp_XiXCv3U4XJTLO0KH3YuQ8lvCLYPqzs,9781
 upgini/metrics.py,sha256=DLvA2YLV4f7lnzBCcfZ5T4NkqAv3pbstbjTepavuT7U,30688
 upgini/search_task.py,sha256=LtRJ9bCPjMo1gJ-sUDKERhDwGcWKImrzwVFHjkMSQHQ,17071
@@ -19,10 +19,10 @@ upgini/autofe/date.py,sha256=qzk0NT332Q0vR1eRwTuNiMSrGE3ulh6Ic3QLBZqSdvw,7284
 upgini/autofe/feature.py,sha256=_V9B74B3ue7eAYXSOt9JKhVC9klkAKks22MwnBRye_w,12487
 upgini/autofe/groupby.py,sha256=4WjDzQxqpZxB79Ih4ihMMI5GDxaFqiH6ZelfV82ClT4,3091
 upgini/autofe/operand.py,sha256=MKEsl3zxpWzRDpTkE0sNJxTu62U20sWOvEKhPjUWS6s,2915
-upgini/autofe/unary.py,sha256=_BjdjPRFCZSL42hX_MSzQeIvtTVZ_FnvasRZKMtuayc,3739
+upgini/autofe/unary.py,sha256=ZWjLd-CUkNt_PpM8YuWLLipW1v_RdBlsl4JxXIVo9aM,3652
 upgini/autofe/vector.py,sha256=dLxfAstJs-gw_OQ1xxoxcM6pVzORlV0HVzdzt7cLXVQ,606
 upgini/data_source/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-upgini/data_source/data_source_publisher.py,sha256=B4fJ1owDCF5ZZ0Ca9ywi_CXVt4iPvABh5BGTnXdXmHk,16635
+upgini/data_source/data_source_publisher.py,sha256=2BCFcglyZC1T5WYerqd_GGC6dg22o2Mh-ce53wOIOjQ,17465
 upgini/mdc/__init__.py,sha256=aM08nIWFc2gWdWUa3_IuEnNND0cQPkBGnYpRMnfFN8k,1019
 upgini/mdc/context.py,sha256=3u1B-jXt7tXEvNcV3qmR9SDCseudnY7KYsLclBdwVLk,1405
 upgini/normalizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -56,7 +56,7 @@ upgini/utils/sklearn_ext.py,sha256=13jQS_k7v0aUtudXV6nGUEWjttPQzAW9AFYL5wgEz9k,4
 upgini/utils/target_utils.py,sha256=Y96_PJ5cC-WsEbeqg20v9uqywDQobLoTb-xoP7S3o4E,7807
 upgini/utils/track_info.py,sha256=G5Lu1xxakg2_TQjKZk4b5SvrHsATTXNVV3NbvWtT8k8,5663
 upgini/utils/warning_counter.py,sha256=dIWBB4dI5XRRJZudvIlqlIYKEiwLLPcXarsZuYRt338,227
-upgini-1.1.291a3232.post3.dist-info/METADATA,sha256=S0aJ1bcO5UxRuM0UiqKCUP2t2qhBqVjdx1vYeSt976U,48128
-upgini-1.1.291a3232.post3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-upgini-1.1.291a3232.post3.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.1.291a3232.post3.dist-info/RECORD,,
+upgini-1.1.292.dist-info/METADATA,sha256=VsA4dkEyCQEUAunLd-p24iOLBHnVFFMMVCb5SisZjck,48117
+upgini-1.1.292.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+upgini-1.1.292.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.1.292.dist-info/RECORD,,