upgini 1.2.84__py3-none-any.whl → 1.2.85__py3-none-any.whl

upgini/__about__.py

@@ -1 +1 @@
-__version__ = "1.2.84"
+__version__ = "1.2.85"

upgini/features_enricher.py

@@ -3,6 +3,7 @@ import datetime
 import gc
 import hashlib
 import itertools
+import json
 import logging
 import numbers
 import os
@@ -59,6 +60,7 @@ from upgini.metadata import (
     CVType,
     FeaturesMetadataV2,
     FileColumnMeaningType,
+    FileColumnMetadata,
     ModelTaskType,
     RuntimeParameters,
     SearchKey,
@@ -2152,7 +2154,7 @@ class FeaturesEnricher(TransformerMixin):
             trace_id = trace_id or uuid.uuid4()
             return search_task.get_progress(trace_id)
 
-    def get_transactional_transform_api(self, only_online_sources=False):
+    def display_transactional_transform_api(self, only_online_sources=False):
         if self.api_key is None:
             raise ValidationError(self.bundle.get("transactional_transform_unregistered"))
         if self._search_task is None:
@@ -2178,20 +2180,36 @@ class FeaturesEnricher(TransformerMixin):
             return "test_value"
 
         file_metadata = self._search_task.get_file_metadata(str(uuid.uuid4()))
+
+        def get_column_meta(column_name: str) -> FileColumnMetadata:
+            for c in file_metadata.columns:
+                if c.name == column_name:
+                    return c
+
         search_keys = file_metadata.search_types()
         if SearchKey.IPV6_ADDRESS in search_keys:
             search_keys.pop(SearchKey.IPV6_ADDRESS, None)
-        original_names = {c.name: c.originalName for c in file_metadata.columns}
-        keys = (
-            "{"
-            + ", ".join(
-                [
-                    f'"{key.name}": {{"name": "{original_names.get(name, name)}", "value": "{key_example(key)}"}}'
-                    for key, name in search_keys.items()
-                ]
-            )
-            + "}"
-        )
+
+        search_keys_with_values = dict()
+        for sk_type, sk_name in search_keys.items():
+            if sk_type == SearchKey.IPV6_ADDRESS:
+                continue
+
+            sk_meta = get_column_meta(sk_name)
+            if sk_meta is None:
+                search_keys_with_values[sk_type.name] = [{"name": sk_name, "value": key_example(sk_type)}]
+            else:
+                if sk_meta.isUnnest:
+                    search_keys_with_values[sk_type.name] = [
+                        {"name": name, "value": key_example(sk_type)} for name in sk_meta.unnestKeyNames
+                    ]
+                else:
+                    search_keys_with_values[sk_type.name] = [{
+                        "name": sk_meta.originalName,
+                        "value": key_example(sk_type),
+                    }]
+
+        keys_section = json.dumps(search_keys_with_values)
         features_for_transform = self._search_task.get_features_for_transform()
         if features_for_transform:
             original_features_for_transform = [
@@ -2212,7 +2230,7 @@ class FeaturesEnricher(TransformerMixin):
 curl 'https://search.upgini.com/online/api/http_inference_trigger?search_id={search_id}' \\
     -H 'Authorization: {self.api_key}' \\
     -H 'Content-Type: application/json' \\
-    -d '{{"search_keys": {keys}{features_section}, "only_online_sources": {str(only_online_sources).lower()}}}'
+    -d '{{"search_keys": {keys_section}{features_section}, "only_online_sources": {str(only_online_sources).lower()}}}'
 
 {Format.BOLD}Python{Format.END}:
 
@@ -2221,13 +2239,12 @@ import requests
 response = requests.post(
     url='https://search.upgini.com/online/api/http_inference_trigger?search_id={search_id}',
     headers={{'Authorization': '{self.api_key}'}},
-    json={{"search_keys": {keys}{features_section}, "only_online_sources": {only_online_sources}}}
+    json={{"search_keys": {keys_section}{features_section}, "only_online_sources": {only_online_sources}}}
 )
 if response.status_code == 200:
     print(response.json())
 """
-
-        return api_example
+        print(api_example)
 
     def _get_copy_of_runtime_parameters(self) -> RuntimeParameters:
         return RuntimeParameters(properties=self.runtime_parameters.properties.copy())
@@ -2288,7 +2305,7 @@ if response.status_code == 200:
                 msg = self.bundle.get("online_api_features_transform").format(online_api_features)
                 self.logger.warning(msg)
                 print(msg)
-                print(self.get_transactional_transform_api(only_online_sources=True))
+                self.display_transactional_transform_api(only_online_sources=True)
 
             if not metrics_calculation:
                 transform_usage = self.rest_client.get_current_transform_usage(trace_id)

{upgini-1.2.84.dist-info → upgini-1.2.85.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: upgini
-Version: 1.2.84
+Version: 1.2.85
 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.84.dist-info → upgini-1.2.85.dist-info}/RECORD

@@ -1,9 +1,9 @@
-upgini/__about__.py,sha256=aeTule-I84yrLN0UOJAi64jLCLq3VVYxtUewFZihoH8,23
+upgini/__about__.py,sha256=GQcOPY8MByuUtzBlWgL-5Ml2KS1SWi19jFLxrEPAY_Q,23
 upgini/__init__.py,sha256=LXSfTNU0HnlOkE69VCxkgIKDhWP-JFo_eBQ71OxTr5Y,261
 upgini/ads.py,sha256=nvuRxRx5MHDMgPr9SiU-fsqRdFaBv8p4_v1oqiysKpc,2714
 upgini/dataset.py,sha256=fRtqSkXNONLnPe6cCL967GMt349FTIpXzy_u8LUKncw,35354
 upgini/errors.py,sha256=2b_Wbo0OYhLUbrZqdLIx5jBnAsiD1Mcenh-VjR4HCTw,950
-upgini/features_enricher.py,sha256=2ryADtOVEEebuUBhimusvnBzGxUkdTaqpEh2F1PqHSs,212719
+upgini/features_enricher.py,sha256=G0qbRPdlWe9p6cwYF3khP99-0kgAO8N0A2sfQxSLgmM,213446
 upgini/http.py,sha256=AfaJ3c8z_tK2hZFEehNybDKE0mp1tYcyAP_l0_p8bLQ,43933
 upgini/metadata.py,sha256=zt_9k0iQbWXuiRZcel4ORNPdQKt6Ou69ucZD_E1Q46o,12341
 upgini/metrics.py,sha256=3cip0_L6-OFew74KsRwzxJDU6UFq05h2v7IsyHLcMRc,43164
@@ -70,7 +70,7 @@ upgini/utils/target_utils.py,sha256=LRN840dzx78-wg7ftdxAkp2c1eu8-JDvkACiRThm4HE,
 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.84.dist-info/METADATA,sha256=jn2nCo_PdZx_hdSQYi9RFAFY7XyzgLlvz-U-WSY9Hm0,49162
-upgini-1.2.84.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-upgini-1.2.84.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
-upgini-1.2.84.dist-info/RECORD,,
+upgini-1.2.85.dist-info/METADATA,sha256=cEtUjRx8eUntASmye2LUmZX78RCWtrMm43z2ZCWyhW8,49162
+upgini-1.2.85.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+upgini-1.2.85.dist-info/licenses/LICENSE,sha256=5RRzgvdJUu3BUDfv4bzVU6FqKgwHlIay63pPCSmSgzw,1514
+upgini-1.2.85.dist-info/RECORD,,