sunholo 0.131.3__py3-none-any.whl → 0.131.5__py3-none-any.whl

sunholo/discovery_engine/cli.py

@@ -7,6 +7,8 @@ import traceback # For detailed error logging
 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
+
 except ImportError:
     # Fallback if rich is not available or path is wrong
     class ConsoleFallback:
@@ -340,17 +342,31 @@ def search_engine_command(args):
                         console.print("\n[bold green]Search Summary:[/bold green]")
                         console.print(page.summary.summary_text)
                         if args.include_citations and hasattr(page.summary, 'summary_with_metadata') and page.summary.summary_with_metadata:
-                             citations = page.summary.summary_with_metadata.citations
-                             if citations:
-                                  console.print("[bold cyan]Citations:[/bold cyan]")
-                                  for i, citation in enumerate(citations):
-                                       source_info = ", ".join([f"'{s.citation_source}'" for s in citation.sources]) if citation.sources else "N/A"
-                                       console.print(f"  [{i+1}] Sources: {source_info}")
-                             references = page.summary.summary_with_metadata.references
-                             if references:
-                                 console.print("[bold cyan]References:[/bold cyan]")
-                                 for ref in references:
-                                     console.print(f"  - Title: {getattr(ref, 'title', 'N/A')}, URI: {getattr(ref, 'uri', 'N/A')}") # Adjust based on actual reference structure
+                            citation_metadata = page.summary.summary_with_metadata.citation_metadata
+                            if citation_metadata and hasattr(citation_metadata, 'citations'):
+                                # Get the actual list of Citation objects
+                                citation_list = citation_metadata.citations
+                                console.print("[bold cyan]Citations:[/bold cyan]")
+                                for i, citation in enumerate(citation_list):
+                                    # citation is now a Citation object with start_index, end_index, sources
+                                    source_details = []
+                                    # Check if the citation has sources and iterate through them
+                                    if hasattr(citation, 'sources') and citation.sources:
+                                        for source in citation.sources:
+                                            # source is a CitationSource object with reference_index
+                                            ref_idx = getattr(source, 'reference_index', 'N/A')
+                                            source_details.append(f"RefIdx:{ref_idx}") # Append details of each source
+
+                                    source_info = ", ".join(source_details) if source_details else "No Source Info"
+                                    start_idx = getattr(citation, 'start_index', 'N/A')
+                                    end_idx = getattr(citation, 'end_index', 'N/A')
+                                    console.print(f"  Citation {i+1}: Segment [{start_idx}-{end_idx}], Sources [{source_info}]")
+
+                            references = page.summary.summary_with_metadata.references
+                            if references:
+                                console.print("[bold cyan]References:[/bold cyan]")
+                                for ref in references:
+                                    console.print(f"  - Title: {getattr(ref, 'title', 'N/A')}, URI: {getattr(ref, 'uri', 'N/A')}") # Adjust based on actual reference structure
 
                         console.print("-" * 20)
 
@@ -369,9 +385,10 @@ def search_engine_command(args):
                               if doc.struct_data:
                                    try:
                                        # Convert Struct to dict for nice printing
-                                       struct_dict = dict(doc.struct_data)
+                                       struct_dict = MessageToDict(doc.struct_data._pb)
                                        console.print(f"  Metadata: {json.dumps(struct_dict, indent=2)}")
-                                   except Exception:
+                                   except Exception as json_err:
+                                       console.print(f"[yellow]  Warning: Could not convert metadata Struct to JSON: {json_err}[/yellow]")
                                        console.print(f"  Metadata: {doc.struct_data}") # Fallback
 
                               # Display Snippets if requested and available

{sunholo-0.131.3.dist-info → sunholo-0.131.5.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.131.3
-Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
+Version: 0.131.5
+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
 Project-URL: Homepage, https://github.com/sunholo-data/sunholo-py

{sunholo-0.131.3.dist-info → sunholo-0.131.5.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=FegPb2BgD6Dg_K4SI6E6zxbQFcHJyyU7V6lH6axK5iU,30107
+sunholo/discovery_engine/cli.py,sha256=-ERTG9jxt6bEMkCfXRYCrCxTth_Y2XhS3TkK1t-W_f8,31462
 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.3.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.131.3.dist-info/METADATA,sha256=UKUm8gkwrGjIHMAJ8vZlRmKamC_T--HrBSpfAFxH1WI,10084
-sunholo-0.131.3.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-sunholo-0.131.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.131.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.131.3.dist-info/RECORD,,
+sunholo-0.131.5.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.131.5.dist-info/METADATA,sha256=hRtqYxbxEn06q1a3HM2nOIhYC2ugJ5Z7G4zm4YfHaCw,10067
+sunholo-0.131.5.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+sunholo-0.131.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.131.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.131.5.dist-info/RECORD,,