sunholo 0.134.4__py3-none-any.whl → 0.134.5__py3-none-any.whl

sunholo/discovery_engine/cli.py

@@ -224,34 +224,56 @@ def search_command(args):
         if args.parse_chunks_to_string:
             console.print("\n[bold magenta]--- Combined Chunk String ---[/bold magenta]")
             console.print(results_data if results_data else "[yellow]No results found or error occurred.[/yellow]")
+        elif isinstance(results_data, str):
+            # Handle string result when parse_chunks_to_string is False but a string was returned anyway
+            console.print("\n[bold magenta]--- Results String ---[/bold magenta]")
+            console.print(results_data)
         elif results_data: # It's a pager object
-            console.print("\n[bold magenta]--- Individual Chunks ---[/bold magenta]")
-            chunk_count = 0
-            try:
-                 # Iterate through the pager returned by get_chunks
-                 for page in results_data.pages:
-                     if not hasattr(page, 'results') or not page.results: continue
-                     for result in page.results:
-                          # Ensure the result structure is as expected by get_chunks
-                          if hasattr(result, 'chunk'):
-                               chunk_count += 1
-                               console.print(f"\n[bold]Chunk {chunk_count}:[/bold]")
-                               # Use the client's formatter if available
-                               console.print(client.chunk_format(result.chunk))
-                          elif hasattr(result, 'document') and hasattr(result.document, 'chunks'):
-                               # Fallback if structure is different (e.g., document with chunks)
-                               for chunk in result.document.chunks:
-                                    chunk_count += 1
-                                    console.print(f"\n[bold]Chunk {chunk_count} (from doc {result.document.id}):[/bold]")
-                                    console.print(f"  Content: {getattr(chunk, 'content', 'N/A')}")
-                                    console.print(f"  Doc Name: {getattr(chunk, 'document_metadata', {}).get('name', 'N/A')}") # Example access
-
-                 if chunk_count == 0:
-                     console.print("[yellow]No chunks found in the results.[/yellow]")
-
-            except Exception as page_err:
-                 console.print(f"[bold red]Error processing search results pager: {page_err}[/bold red]")
-                 console.print(f"[red]{traceback.format_exc()}[/red]")
+            if args.content_search_spec_type == "chunks":
+                console.print("\n[bold magenta]--- Individual Chunks ---[/bold magenta]")
+                chunk_count = 0
+                try:
+                    # Iterate through the pager returned by get_chunks
+                    for page in results_data.pages:
+                        if not hasattr(page, 'results') or not page.results: continue
+                        for result in page.results:
+                            # Ensure the result structure is as expected by get_chunks
+                            if hasattr(result, 'chunk'):
+                                chunk_count += 1
+                                console.print(f"\n[bold]Chunk {chunk_count}:[/bold]")
+                                # Use the client's formatter if available
+                                console.print(client.chunk_format(result.chunk))
+                            elif hasattr(result, 'document') and hasattr(result.document, 'chunks'):
+                                # Fallback if structure is different (e.g., document with chunks)
+                                for chunk in result.document.chunks:
+                                        chunk_count += 1
+                                        console.print(f"\n[bold]Chunk {chunk_count} (from doc {result.document.id}):[/bold]")
+                                        console.print(f"  Content: {getattr(chunk, 'content', 'N/A')}")
+                                        console.print(f"  Doc Name: {getattr(chunk, 'document_metadata', {}).get('name', 'N/A')}") 
+                    if chunk_count == 0:
+                        console.print("[yellow]No chunks found in the results.[/yellow]")
+
+                except Exception as page_err:
+                    console.print(f"[bold red]Error processing search results pager: {page_err}[/bold red]")
+                    console.print(f"[red]{traceback.format_exc()}[/red]")
+            elif args.content_search_spec_type == "documents":
+                console.print("\n[bold magenta]--- Individual Documents ---[/bold magenta]")
+                doc_count = 0
+                try:
+                    # Iterate through the pager returned by get_documents
+                    for page in results_data.pages:
+                        if not hasattr(page, 'results') or not page.results: continue
+                        for result in page.results:
+                            if hasattr(result, 'document'):
+                                doc_count += 1
+                                console.print(f"\n[bold]Document {doc_count}:[/bold]")
+                                console.print(client.document_format(result.document))
+                    
+                    if doc_count == 0:
+                        console.print("[yellow]No documents found in the results.[/yellow]")
+                except Exception as page_err:
+                    console.print(f"[bold red]Error processing document results: {page_err}[/bold red]")
+                    console.print(f"[red]{traceback.format_exc()}[/red]")
         else:
             console.print("[yellow]No results found or error occurred.[/yellow]")
 

{sunholo-0.134.4.dist-info → sunholo-0.134.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sunholo
-Version: 0.134.4
+Version: 0.134.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

{sunholo-0.134.4.dist-info → sunholo-0.134.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=bUhCPoKrkMtdeTBHLyCZf9syVwHn5kE0yXpqDBIzmTc,34120
+sunholo/discovery_engine/cli.py,sha256=0FKitDCqnKwtONyGt7gmsRoE5W6HHCIDqaTt8S0Dw4s,35631
 sunholo/discovery_engine/create_new.py,sha256=WUi4_xh_dFaGX3xA9jkNKZhaR6LCELjMPeRb0hyj4FU,1226
 sunholo/discovery_engine/discovery_engine_client.py,sha256=Ak3VpadtgpPWfIEot87EiNh4vbDUg9gQVa-1UDnoGMA,58442
 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.134.4.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.134.4.dist-info/METADATA,sha256=g2a99cYiyPfDeVa55srGe2k_5_MHsJhzwBll43hQ56M,10067
-sunholo-0.134.4.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-sunholo-0.134.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.134.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.134.4.dist-info/RECORD,,
+sunholo-0.134.5.dist-info/licenses/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.134.5.dist-info/METADATA,sha256=OyzGPXRwE0gTZBioO_oT-pHLXH4s-Fw51ws6pWmT_Jc,10067
+sunholo-0.134.5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+sunholo-0.134.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.134.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.134.5.dist-info/RECORD,,