request-vm-on-golem 0.1.56__py3-none-any.whl → 0.1.57__py3-none-any.whl

{request_vm_on_golem-0.1.56.dist-info → request_vm_on_golem-0.1.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: request-vm-on-golem
-Version: 0.1.56
+Version: 0.1.57
 Summary: VM on Golem Requestor CLI - Create and manage virtual machines on the Golem Network
 Keywords: golem,vm,cloud,decentralized,cli
 Author: Phillip Jensen
@@ -296,12 +296,12 @@ Then, run any `golem` command. For example: `golem vm providers`
 Alternatively, you can prepend the environment variables directly to the command:
 
 ```bash
-GOLEM_REQUESTOR_ENVIRONMENT="development" GOLEM_REQUESTOR_FORCE_LOCALHOST="true" poetry run golem vm providers
+GOLEM_ENVIRONMENT="development" GOLEM_REQUESTOR_FORCE_LOCALHOST="true" poetry run golem vm providers
 ```
 
 ### Mode vs. Network
 
-- Development Mode (`GOLEM_REQUESTOR_ENVIRONMENT=development`)
+- Development Mode (`GOLEM_ENVIRONMENT=development`)
   - Improves local workflows: prefixes central discovery URL with `DEVMODE-` and, when using the central driver, maps provider IPs to `localhost` for easier testing.
   - Does not determine chain selection.
 
@@ -428,7 +428,7 @@ export GOLEM_REQUESTOR_SSH_KEY_DIR="/path/to/keys"
 export GOLEM_REQUESTOR_DB_PATH="/path/to/database.db"
 
 # Environment Mode (defaults to "production")
-export GOLEM_REQUESTOR_ENVIRONMENT="development"  # Optional: Switch to development mode
+export GOLEM_ENVIRONMENT="development"  # Optional: Switch to development mode
 export GOLEM_REQUESTOR_FORCE_LOCALHOST="true"    # Optional: Force localhost in development mode
 export GOLEM_REQUESTOR_NETWORK="testnet"         # Or "mainnet"; optional filter for listing/creation
 ```

{request_vm_on_golem-0.1.56.dist-info → request_vm_on_golem-0.1.57.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=Obr8Z1ZX3f6WThooIInlD7HqMl_pJmOqawzazLmhke0,51253
-requestor/config.py,sha256=FMSRKdyo3nEdn62CRonnwrw4Hsy4VGcuvvfg60aORsI,12809
+requestor/config.py,sha256=gawIdSbv7GVReXoFB-IoCc5mw8n9Gmvk0xWndzxk9Ho,14021
 requestor/data/deployments/l2.json,sha256=XTNN2C5LkBfp4YbDKdUKfWMdp1fKnfv8D3TgcwVWxtQ,249
 requestor/db/__init__.py,sha256=Gm5DfWls6uvCZZ3HGGnyRHswbUQdeA5OGN8yPwH0hc8,88
 requestor/db/sqlite.py,sha256=l5pWbx2qlHuar1N_a0B9tVnmumLJY1w5rp3yZ7jmsC0,4146
@@ -11,11 +11,11 @@ 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=bWj4sNQ8w4F2sSRcMlHbWVjeBLAflDhHxy0BNMqzj8s,5021
-requestor/run.py,sha256=sR9GgylQWbYPc60wRr3rUpemlNrWqIPNFIJ8WCz6YwE,2120
+requestor/run.py,sha256=ErbYJFZ6v-FagI6Fb-1FIKe775u6wsA_etelhagXHaI,2444
 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
-requestor/services/provider_service.py,sha256=XMZtdkrpEKiGg0iFW3v_cf3zu7BZcYp1wjaphxo2SCU,16250
+requestor/services/provider_service.py,sha256=jUpIyEMUb2OK_5_qOyeUte3X-xwThyWukqdUQ1hIlDk,16612
 requestor/services/ssh_service.py,sha256=tcOCtk2SlB9Uuv-P2ghR22e7BJ9kigQh5b4zSGdPFns,4280
 requestor/services/vm_service.py,sha256=e05OgMZwz3NcCiIwmz4EnB6joMK6S3G_RT3VajD92lw,9438
 requestor/settings.py,sha256=OzBVwtnCRn8qg_ByEJDGpQowz4zkdA81uIWU4_OsPjQ,1183
@@ -23,7 +23,7 @@ requestor/ssh/__init__.py,sha256=hNgSqJ5s1_AwwxVRyFjUqh_LTBpI4Hmzq0F-f_wXN9g,119
 requestor/ssh/manager.py,sha256=3jQtbbK7CVC2yD1zCO88jGXh2fBcuv3CzWEqDLuaQVk,9758
 requestor/utils/logging.py,sha256=lgAswzYvO9M0EOET0cFZvuAsGI4lInh_wln_6bI-fJk,4281
 requestor/utils/spinner.py,sha256=X0jfPfs5ricglTS4_XmacrM2Z1DDHR7zGk2KqYZDpXg,2541
-request_vm_on_golem-0.1.56.dist-info/METADATA,sha256=pTeRTJd-v6xEdUIJTdS44hdl3_atkEB9MaKg7LJ5FIw,15780
-request_vm_on_golem-0.1.56.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-request_vm_on_golem-0.1.56.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
-request_vm_on_golem-0.1.56.dist-info/RECORD,,
+request_vm_on_golem-0.1.57.dist-info/METADATA,sha256=XurwaN_AT6HMxo3dt-oeW3X07IYXtvGvjhK5VcGKWhc,15750
+request_vm_on_golem-0.1.57.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+request_vm_on_golem-0.1.57.dist-info/entry_points.txt,sha256=Z-skRNpJ8aZcIl_En9mEm1ygkp9FKy0bzQoL3zO52-0,44
+request_vm_on_golem-0.1.57.dist-info/RECORD,,

requestor/config.py

@@ -22,7 +22,7 @@ def ensure_config() -> None:
         created = True
 
     if not env_file.exists():
-        env_file.write_text("GOLEM_REQUESTOR_ENVIRONMENT=production\n")
+        env_file.write_text("GOLEM_ENVIRONMENT=production\n")
         created = True
 
     private_key = ssh_dir / "id_rsa"
@@ -91,6 +91,29 @@ class RequestorConfig(BaseSettings):
             return f"DEVMODE-{v}"
         return v
 
+    @field_validator("environment", mode="before")
+    @classmethod
+    def prefer_global_env(cls, v: str) -> str:
+        """Prefer unified GOLEM_ENVIRONMENT when provided; fallback to service-specific env."""
+        ge = os.environ.get("GOLEM_ENVIRONMENT")
+        if ge:
+            return ge
+        return v
+
+    @field_validator("network", mode="before")
+    @classmethod
+    def default_network_for_dev(cls, v: str, info: ValidationInfo) -> str:
+        """Use 'testnet' by default when in development environment unless explicitly set."""
+        if v:
+            return v
+        try:
+            env = info.data.get("environment")
+        except Exception:
+            env = os.environ.get("GOLEM_ENVIRONMENT")
+        if (env or "").lower() == "development":
+            return "testnet"
+        return v or "mainnet"
+
     # Golem Base Settings
     golem_base_rpc_url: str = Field(
         default="https://ethwarsaw.holesky.golemdb.io/rpc",
@@ -101,8 +124,8 @@ class RequestorConfig(BaseSettings):
         description="Golem Base WebSocket URL"
     )
     advertisement_interval: int = Field(
-        default=240,
-        description="Advertisement interval in seconds (should match provider)"
+        default=3600,
+        description="Advertisement interval in seconds (should match provider's GOLEM_BASE_ADVERTISEMENT_INTERVAL)"
     )
     ethereum_private_key: str = Field(
         default="0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -323,6 +346,10 @@ class RequestorConfig(BaseSettings):
         # Allow overriding to dev mode with golem_dev_mode
         if os.environ.get('golem_dev_mode', 'false').lower() in ('true', '1', 't'):
             kwargs['environment'] = "development"
+        # Fallback: if requestor env not provided but provider env signals development, mirror it
+        if not kwargs.get('environment') and os.environ.get('GOLEM_ENVIRONMENT'):
+            # Mirror unified GOLEM_ENVIRONMENT into requestor environment if not explicitly provided
+            kwargs['environment'] = os.environ.get('GOLEM_ENVIRONMENT')
 
         # Set dependent paths before validation
         if 'ssh_key_dir' not in kwargs:

requestor/run.py

@@ -48,9 +48,15 @@ def check_requirements() -> bool:
 def main():
     """Run the requestor CLI."""
     try:
-        # Load environment variables from .env.dev file if it exists, otherwise use .env
-        dev_env_path = Path(__file__).parent.parent / '.env.dev'
-        env_path = dev_env_path if dev_env_path.exists() else Path(__file__).parent.parent / '.env'
+        # Load environment variables based on unified environment
+        env_mode = (os.environ.get('GOLEM_ENVIRONMENT') or os.environ.get('GOLEM_REQUESTOR_ENVIRONMENT') or '').lower()
+        base_dir = Path(__file__).parent.parent
+        env_file = '.env.dev' if env_mode == 'development' else '.env'
+        env_path = base_dir / env_file
+        # If chosen file does not exist, fallback to the other
+        if not env_path.exists():
+            alt = base_dir / ('.env' if env_file == '.env.dev' else '.env.dev')
+            env_path = alt if alt.exists() else env_path
         load_dotenv(dotenv_path=env_path)
         logger.info(f"Loading environment variables from: {env_path}")
 

requestor/services/provider_service.py

@@ -272,13 +272,22 @@ class ProviderService:
             )
 
     async def _format_block_timestamp(self, block_number: int) -> str:
-        """Format a block number into a human-readable 'time ago' string."""
+        """Format a block number into a human-readable 'time ago' string.
+
+        The Golem Base chain uses ~2 seconds per block.
+        We also guard against negative diffs that can occur when adverts are
+        extended before expiry (expires_at increases), which would otherwise
+        make the derived "created_at" appear in the future.
+        """
         if not self.golem_base_client:
             return "N/A"
         try:
             latest_block = await self.golem_base_client.http_client().eth.get_block('latest')
             block_diff = latest_block.number - block_number
-            seconds_ago = block_diff * 2  # Approximate block time
+            if block_diff < 0:
+                block_diff = 0
+            # Approximate time: ~2s per block
+            seconds_ago = block_diff * 2
             
             if seconds_ago < 60:
                 return f"{int(seconds_ago)}s ago"