sunholo 0.131.7__py3-none-any.whl → 0.131.9__py3-none-any.whl

sunholo/discovery_engine/cli.py

@@ -8,7 +8,7 @@ try:
     # Assuming sun_rich is in your project structure relative to this file
     from ..cli.sun_rich import console
     from google.protobuf.json_format import MessageToDict
-
+    import proto
 except ImportError:
     # Fallback if rich is not available or path is wrong
     class ConsoleFallback:
@@ -31,6 +31,26 @@ else:
     discoveryengine = None # Set to None if import failed
 
 
+def convert_composite_to_native(value):
+    """
+    Recursively converts a proto MapComposite or RepeatedComposite object to native Python types.
+
+    Args:
+        value: The proto object, which could be a MapComposite, RepeatedComposite, or a primitive.
+
+    Returns:
+        The equivalent Python dictionary, list, or primitive type.
+    """
+    if isinstance(value, proto.marshal.collections.maps.MapComposite):
+        # Convert MapComposite to a dictionary, recursively processing its values
+        return {key: convert_composite_to_native(val) for key, val in value.items()}
+    elif isinstance(value, proto.marshal.collections.repeated.RepeatedComposite):
+        # Convert RepeatedComposite to a list, recursively processing its elements
+        return [convert_composite_to_native(item) for item in value]
+    else:
+        # If it's a primitive value, return it as is
+        return value
+
 # --- Command Handler Functions ---
 
 def discovery_engine_command(args):
@@ -382,33 +402,12 @@ def search_engine_command(args):
                             console.print(f"  Name: {doc.name}")
                             # Display structData if present
                             if doc.struct_data:
-                                # Attempt 1: Preferred - Use proto-plus .to_json() if available
-                                if hasattr(doc.struct_data, 'to_json'):
-                                    console.print(f"[yellow]  to_json[/yellow]")
-                                    # Pass indent directly if the method supports it
-                                    try:
-                                        metadata_output = doc.struct_data.to_json(indent=2)
-                                    except TypeError: # In case to_json doesn't accept indent
-                                        metadata_output = doc.struct_data.to_json()
-                                        # Optionally re-parse and indent if needed, but often okay as is
-                                        # parsed_json = json.loads(metadata_output)
-                                        # metadata_output = json.dumps(parsed_json, indent=2)
-
-
-                                # Attempt 2: Use proto-plus .to_dict() then json.dumps
-                                elif hasattr(doc.struct_data, 'to_dict'):
-                                    console.print(f"[yellow]  to_dict[/yellow]")
-
-                                    struct_dict = doc.struct_data.to_dict()
-                                    metadata_output = json.dumps(struct_dict, indent=2)
-                                else:
-                                    try:
-                                        # Convert Struct to dict for nice printing
-                                        struct_dict = str(doc.struct_data)
-                                        metadata_output = json.dumps(struct_dict, indent=2)
-                                    except Exception as json_err:
-                                        console.print(f"[yellow]  Warning: Could not convert metadata Struct to JSON: {json_err}[/yellow]")
-                                        metadata_output = doc.struct_data
+                                try:
+                                    struct_dict = convert_composite_to_native(doc.struct_data)
+                                    metadata_output = struct_dict.get("structData", {})
+                                except Exception as json_err:
+                                    console.print(f"[yellow]  Warning: Could not convert metadata Struct to JSON: {json_err}[/yellow]")
+                                    metadata_output = doc.struct_data
                             console.print(f"  Metadata: {json.dumps(metadata_output, indent=2)}")
                             # Display Snippets if requested and available
                             if args.return_snippet and 'snippets' in doc.derived_struct_data:

{sunholo-0.131.7.dist-info → sunholo-0.131.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.131.7
+Version: 0.131.9
 Summary: AI DevOps - a package to help deploy GenAI to the Cloud.
 Author-email: Holosun ApS <multivac@sunholo.com>
 License: Apache License, Version 2.0

{sunholo-0.131.7.dist-info → sunholo-0.131.9.dist-info}/RECORD

@@ -73,7 +73,7 @@ sunholo/database/sql/sb/return_sources.sql,sha256=89KAnxfK8n_qGK9jy1OQT8f9n4uYUt
 sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3-zZI,89
 sunholo/discovery_engine/__init__.py,sha256=hLgqRDJ22Aov9o2QjAEfsVgnL3kMdM-g5p8RJ9OyKdQ,130
 sunholo/discovery_engine/chunker_handler.py,sha256=wkvXl4rFtYfN6AZUKdW9_QD49Whf77BukDbO82UwlAg,7480
-sunholo/discovery_engine/cli.py,sha256=BJsjZ5s9lmX4Wo7OabE9CW14XbiQfx3trRaIw3y7vvo,32885
+sunholo/discovery_engine/cli.py,sha256=sFPBQ7DLX-ra-oJyArkeZlpZDZB6uJQ897euOKim79g,32345
 sunholo/discovery_engine/create_new.py,sha256=WUi4_xh_dFaGX3xA9jkNKZhaR6LCELjMPeRb0hyj4FU,1226
 sunholo/discovery_engine/discovery_engine_client.py,sha256=nV4loBBnOqGPRlEbFIFRJEB6cXKDVgJOMRMdf4-v510,51775
 sunholo/discovery_engine/get_ai_search_chunks.py,sha256=I6Dt1CznqEvE7XIZ2PkLqopmjpO96iVEWJJqL5cJjOU,5554
@@ -168,9 +168,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.131.7.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.131.7.dist-info/METADATA,sha256=IV3U8oDWbRRvlfV17OtG6U2Y1EADO_nKBUrFCFaiclM,10067
-sunholo-0.131.7.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-sunholo-0.131.7.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.131.7.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.131.7.dist-info/RECORD,,
+sunholo-0.131.9.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.131.9.dist-info/METADATA,sha256=ont3YhP76bAiAr3Gt4KUjTbrLciKG6m67su-Yj-pwOA,10067
+sunholo-0.131.9.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+sunholo-0.131.9.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.131.9.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.131.9.dist-info/RECORD,,