request-vm-on-golem 0.1.53__py3-none-any.whl → 0.1.54__py3-none-any.whl

{request_vm_on_golem-0.1.53.dist-info → request_vm_on_golem-0.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.53
+Version: 0.1.54
 Summary: VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network
 Keywords: golem,vm,cloud,decentralized,cli
 Author: Phillip Jensen

{request_vm_on_golem-0.1.53.dist-info → request_vm_on_golem-0.1.54.dist-info}/RECORD

@@ -1,8 +1,8 @@
 requestor/__init__.py,sha256=OqSUAh1uZBMx7GW0MoSMg967PVdmT8XdPJx3QYjwkak,116
 requestor/api/main.py,sha256=CTnaM7KyBtDwVlyclYbNDy-nGi5_xt9GTcGusRasDVY,2493
 requestor/cli/__init__.py,sha256=e3E4oEGxmGj-STPtFkQwg_qIWhR0JAiAQdw3G1hXciU,37
-requestor/cli/commands.py,sha256=5Nul0oxG_6n-EBqzQX3tO2N10uQpryyrmU9-HxFPovs,49539
-requestor/config.py,sha256=GPsr_NSj04MD40mH6xyVY5FB0ysFDwJk9FJ5h9OQuJ0,12716
+requestor/cli/commands.py,sha256=fKZFsW4d60VYF5wxZnMxZLc0Tqod087P_NjfCQyDfRI,50998
+requestor/config.py,sha256=FMSRKdyo3nEdn62CRonnwrw4Hsy4VGcuvvfg60aORsI,12809
 requestor/data/deployments/l2.json,sha256=XTNN2C5LkBfp4YbDKdUKfWMdp1fKnfv8D3TgcwVWxtQ,249
 requestor/db/__init__.py,sha256=Gm5DfWls6uvCZZ3HGGnyRHswbUQdeA5OGN8yPwH0hc8,88
 requestor/db/sqlite.py,sha256=l5pWbx2qlHuar1N_a0B9tVnmumLJY1w5rp3yZ7jmsC0,4146
@@ -11,7 +11,7 @@ requestor/payments/blockchain_service.py,sha256=CACvZH2ZstutX7f0L_PXl8K_V5WlIkxN
 requestor/payments/monitor.py,sha256=JtSnh2plFf-f8sJU-bkOpadhoK_R82_ULwkDRmBYSbc,6012
 requestor/provider/__init__.py,sha256=fmW23aYUVciF8-gmBZkG-PLhn22upmcDzdPfAOLHG6g,103
 requestor/provider/client.py,sha256=pfJymufYR13W4kfykHZSVvs6ikRUE5AdHp0W0DB17AE,4130
-requestor/run.py,sha256=GqOG6n34szt8Sp3SEqjRV6huWm737yCN6YnBqoiwI-U,1785
+requestor/run.py,sha256=sR9GgylQWbYPc60wRr3rUpemlNrWqIPNFIJ8WCz6YwE,2120
 requestor/security/faucet.py,sha256=XF_13b66SKAaY0-40hNRcSgC8AZA4mD5gyXl3qaBLpQ,2320
 requestor/services/__init__.py,sha256=1qSn_6RMn0KB0A7LCnY2IW6_tC3HBQsdfkFeV-h94eM,172
 requestor/services/database_service.py,sha256=GlSrzzzd7PSYQJNup00sxkB-B2PMr1__04K8k5QSWvs,2996
@@ -20,9 +20,9 @@ requestor/services/ssh_service.py,sha256=tcOCtk2SlB9Uuv-P2ghR22e7BJ9kigQh5b4zSGd
 requestor/services/vm_service.py,sha256=1EUypRbCykdQTVJf4gYiNzkZNk66T3df32Vc51HkSMI,7983
 requestor/ssh/__init__.py,sha256=hNgSqJ5s1_AwwxVRyFjUqh_LTBpI4Hmzq0F-f_wXN9g,119
 requestor/ssh/manager.py,sha256=3jQtbbK7CVC2yD1zCO88jGXh2fBcuv3CzWEqDLuaQVk,9758
-requestor/utils/logging.py,sha256=oFNpO8pJboYM8Wp7g3HOU4HFyBTKypVdY15lUiz1a4I,3721
-requestor/utils/spinner.py,sha256=PUHJdTD9jpUHur__01_qxXy87WFfNmjQbD_sLG-KlGo,2459
-request_vm_on_golem-0.1.53.dist-info/METADATA,sha256=4JOUW7vkkFVjBgNv1zKVLz54hY0xWI2yVJFPc8LSI3E,15780
-request_vm_on_golem-0.1.53.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-request_vm_on_golem-0.1.53.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
-request_vm_on_golem-0.1.53.dist-info/RECORD,,
+requestor/utils/logging.py,sha256=lgAswzYvO9M0EOET0cFZvuAsGI4lInh_wln_6bI-fJk,4281
+requestor/utils/spinner.py,sha256=X0jfPfs5ricglTS4_XmacrM2Z1DDHR7zGk2KqYZDpXg,2541
+request_vm_on_golem-0.1.54.dist-info/METADATA,sha256=STyVVfE84_1K_a-HlKflEM-hZHQJhYo-vQm7vcwtbRQ,15780
+request_vm_on_golem-0.1.54.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+request_vm_on_golem-0.1.54.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
+request_vm_on_golem-0.1.54.dist-info/RECORD,,

requestor/cli/commands.py

@@ -138,6 +138,8 @@ def vm():
 async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Optional[int], country: Optional[str], driver: Optional[str], payments_network: Optional[str] = None, all_payments: bool = False, as_json: bool = False, network: Optional[str] = None):
     """List available providers matching requirements."""
     try:
+        if as_json:
+            os.environ["GOLEM_SILENCE_LOGS"] = "1"
         if network:
             config.network = network
         # Log search criteria if any
@@ -181,7 +183,10 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
 
         if not providers:
             logger.warning("No providers found matching criteria")
-            return {"providers": []}
+            result = {"providers": []}
+            if as_json:
+                click.echo(json.dumps(result, indent=2))
+            return result
 
         # If JSON requested and full spec provided, include estimates per provider
         if as_json and cpu and memory and storage:
@@ -216,6 +221,12 @@ async def list_providers(cpu: Optional[int], memory: Optional[int], storage: Opt
     except Exception as e:
         logger.error(f"Failed to list providers: {str(e)}")
         raise click.Abort()
+    finally:
+        if as_json:
+            try:
+                del os.environ["GOLEM_SILENCE_LOGS"]
+            except Exception:
+                pass
 
 
 @vm.command(name='create')
@@ -385,6 +396,8 @@ def vm_stream():
 async def stream_list(as_json: bool):
     """List payment stream status for all known VMs."""
     try:
+        if as_json:
+            os.environ["GOLEM_SILENCE_LOGS"] = "1"
         vms = await db_service.list_vms()
         if not vms:
             logger.warning("No VMs found in local database")
@@ -461,6 +474,12 @@ async def stream_list(as_json: bool):
     except Exception as e:
         logger.error(f"Failed to list streams: {e}")
         raise click.Abort()
+    finally:
+        if as_json:
+            try:
+                del os.environ["GOLEM_SILENCE_LOGS"]
+            except Exception:
+                pass
 
 
 @vm_stream.command('open')
@@ -550,6 +569,8 @@ async def stream_topup(stream_id: int, glm: float | None, hours: int | None):
 async def stream_status(name: str, as_json: bool):
     """Show the payment stream status for a VM by name."""
     try:
+        if as_json:
+            os.environ["GOLEM_SILENCE_LOGS"] = "1"
         # Resolve VM and provider
         vm = await db_service.get_vm(name)
         if not vm:
@@ -580,6 +601,12 @@ async def stream_status(name: str, as_json: bool):
     except Exception as e:
         logger.error(f"Failed to fetch stream status: {e}")
         raise click.Abort()
+    finally:
+        if as_json:
+            try:
+                del os.environ["GOLEM_SILENCE_LOGS"]
+            except Exception:
+                pass
 
 
 @vm_stream.command('inspect')
@@ -589,6 +616,8 @@ async def stream_status(name: str, as_json: bool):
 async def stream_inspect(stream_id: int, as_json: bool):
     """Inspect a stream directly on-chain (no provider required)."""
     try:
+        if as_json:
+            os.environ["GOLEM_SILENCE_LOGS"] = "1"
         from web3 import Web3
         from golem_streaming_abi import STREAM_PAYMENT_ABI
         w3 = Web3(Web3.HTTPProvider(config.polygon_rpc_url))
@@ -632,6 +661,12 @@ async def stream_inspect(stream_id: int, as_json: bool):
     except Exception as e:
         logger.error(f"Failed to inspect stream: {e}")
         raise click.Abort()
+    finally:
+        if as_json:
+            try:
+                del os.environ["GOLEM_SILENCE_LOGS"]
+            except Exception:
+                pass
 
 
 @cli.group()
@@ -726,6 +761,8 @@ def connect_vm(name: str):
 async def info_vm(name: str, as_json: bool):
     """Show information about a VM."""
     try:
+        if as_json:
+            os.environ["GOLEM_SILENCE_LOGS"] = "1"
         logger.command(f"ℹ️  Getting info for VM '{name}'")
 
         # Initialize VM service
@@ -767,6 +804,12 @@ async def info_vm(name: str, as_json: bool):
     except Exception as e:
         logger.error(f"Failed to get VM info: {str(e)}")
         raise click.Abort()
+    finally:
+        if as_json:
+            try:
+                del os.environ["GOLEM_SILENCE_LOGS"]
+            except Exception:
+                pass
 
 
 @vm.command(name='destroy')
@@ -1054,6 +1097,8 @@ def run_api_server(host: str, port: int, reload: bool):
 async def list_vms(as_json: bool):
     """List all VMs."""
     try:
+        if as_json:
+            os.environ["GOLEM_SILENCE_LOGS"] = "1"
         logger.command("📋 Listing your VMs")
         logger.process("Fetching VM details")
 
@@ -1086,7 +1131,6 @@ async def list_vms(as_json: bool):
                 tablefmt="grid"
             ))
             click.echo("\n" + "─" * 60)
-
         return result
 
     except Exception as e:
@@ -1096,6 +1140,13 @@ async def list_vms(as_json: bool):
         logger.error(f"Failed to list VMs: {error_msg}")
         raise click.Abort()
 
+    finally:
+        if as_json:
+            try:
+                del os.environ["GOLEM_SILENCE_LOGS"]
+            except Exception:
+                pass
+
 
 def main():
     """Entry point for the CLI."""

requestor/config.py

@@ -4,6 +4,7 @@ import os
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from pydantic import Field, field_validator, ValidationInfo
 import os
+import sys
 
 
 def ensure_config() -> None:
@@ -33,7 +34,8 @@ def ensure_config() -> None:
         created = True
 
     if created:
-        print("Using default settings – run with --help to customize")
+        # Write to stderr so stdout stays clean for JSON outputs
+        print("Using default settings – run with --help to customize", file=sys.stderr)
 
 
 ensure_config()

requestor/run.py

@@ -4,6 +4,16 @@ import sys
 from pathlib import Path
 from dotenv import load_dotenv
 
+if "--json" in sys.argv:
+    os.environ["GOLEM_SILENCE_LOGS"] = "1"
+    try:
+        import logging as _logging
+        _logging.getLogger().setLevel(_logging.CRITICAL)
+        _logging.getLogger('rlp').setLevel(_logging.CRITICAL)
+        _logging.getLogger('rlp.codec').setLevel(_logging.CRITICAL)
+    except Exception:
+        pass
+
 from requestor.utils.logging import setup_logger
 
 # Configure logging with debug mode from environment variable

requestor/utils/logging.py

@@ -61,6 +61,8 @@ def setup_logger(name: Optional[str] = None) -> logging.Logger:
     
     # Check DEBUG environment variable
     debug = os.getenv('DEBUG', '').lower() in ('1', 'true', 'yes')
+    # Global silence switch for JSON/machine outputs
+    silence = os.getenv('GOLEM_SILENCE_LOGS', '').lower() in ('1', 'true', 'yes')
     
     # Prevent duplicate logs by removing root handlers
     root = logging.getLogger()
@@ -86,13 +88,22 @@ def setup_logger(name: Optional[str] = None) -> logging.Logger:
         style='%'
     )
     fancy_handler.setFormatter(fancy_formatter)
-    fancy_handler.addFilter(
-        lambda record: record.levelno != DEBUG or debug
-    )
+    # Suppress DEBUG unless DEBUG=1; suppress everything if silence
+    def _filter(record: logging.LogRecord) -> bool:
+        if silence:
+            return False
+        return (record.levelno != DEBUG) or debug
+    fancy_handler.addFilter(_filter)
     logger.addHandler(fancy_handler)
     logger.propagate = False  # Prevent propagation to avoid duplicates
     
-    if debug:
+    if silence:
+        logger.setLevel(CRITICAL)
+        # Silence common libraries and root logger
+        logging.getLogger().setLevel(CRITICAL)
+        logging.getLogger('asyncio').setLevel(CRITICAL)
+        logging.getLogger('aiosqlite').setLevel(CRITICAL)
+    elif debug:
         logger.setLevel(DEBUG)
         # Enable debug logging for other libraries
         logging.getLogger('asyncio').setLevel(DEBUG)

requestor/utils/spinner.py

@@ -11,26 +11,27 @@ class Spinner:
         self.busy = False
         self.spinner_visible = False
         self.message = message
-        sys.stdout.write('\033[?25l')  # Hide cursor
+        # Use stderr so stdout can remain machine-readable (e.g., --json outputs)
+        sys.stderr.write('\033[?25l')  # Hide cursor
 
     def write_next(self):
         """Write the next spinner frame."""
         with self._screen_lock:
             if not self.spinner_visible:
-                sys.stdout.write(f"\r{next(self.spinner)} {self.message}")
+                sys.stderr.write(f"\r{next(self.spinner)} {self.message}")
                 self.spinner_visible = True
-                sys.stdout.flush()
+                sys.stderr.flush()
 
     def remove_spinner(self, cleanup=False):
         """Remove the spinner from the terminal."""
         with self._screen_lock:
             if self.spinner_visible:
-                sys.stdout.write('\r')
-                sys.stdout.write(' ' * (len(self.message) + 2))
-                sys.stdout.write('\r')
+                sys.stderr.write('\r')
+                sys.stderr.write(' ' * (len(self.message) + 2))
+                sys.stderr.write('\r')
                 if cleanup:
-                    sys.stdout.write('\033[?25h')  # Show cursor
-                sys.stdout.flush()
+                    sys.stderr.write('\033[?25h')  # Show cursor
+                sys.stderr.flush()
                 self.spinner_visible = False
 
     def spinner_task(self):
@@ -56,11 +57,11 @@ class Spinner:
         self.remove_spinner(cleanup=True)
         if exc_type is None:
             # Show checkmark on success
-            sys.stdout.write(f"\r✓ {self.message}\n")
+            sys.stderr.write(f"\r✓ {self.message}\n")
         else:
             # Show X on failure
-            sys.stdout.write(f"\r✗ {self.message}\n")
-        sys.stdout.flush()
+            sys.stderr.write(f"\r✗ {self.message}\n")
+        sys.stderr.flush()
 
 def step(message):
     """Decorator to add a spinning progress indicator to a function."""