onehouse-cli 0.1.2__tar.gz → 0.1.4__tar.gz

{onehouse_cli-0.1.2 → onehouse_cli-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onehouse-cli
-Version: 0.1.2
+Version: 0.1.4
 Summary: A command-line tool for executing SQL commands against the Onehouse API
 Author-email: Sagar Lakshmipathy <18vidhyasagar@gmail.com>
 License: Proprietary
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: requests
+Requires-Dist: importlib-metadata>=1.0; python_version < "3.8"
 
 # Onehouse CLI
 
@@ -43,7 +44,8 @@ This will prompt you for:
 - Project Region
 - User ID
 - Request ID
-- Environment (production or staging)
+- API Endpoint (defaults to `https://api.onehouse.ai/v1`)
+  - Press Enter to use the default endpoint
 
 **Credentials are stored in:** `~/.onehouse/credentials`
 

{onehouse_cli-0.1.2 → onehouse_cli-0.1.4}/README.md

@@ -24,7 +24,8 @@ This will prompt you for:
 - Project Region
 - User ID
 - Request ID
-- Environment (production or staging)
+- API Endpoint (defaults to `https://api.onehouse.ai/v1`)
+  - Press Enter to use the default endpoint
 
 **Credentials are stored in:** `~/.onehouse/credentials`
 

onehouse_cli-0.1.4/onehouse_cli/__init__.py

@@ -0,0 +1,21 @@
+"""
+Onehouse CLI - A command-line tool for executing SQL commands against the Onehouse API.
+"""
+
+try:
+    # For Python 3.8+
+    from importlib.metadata import version
+except ImportError:
+    # For Python 3.7
+    from importlib_metadata import version
+
+try:
+    __version__ = version("onehouse-cli")
+except Exception:
+    # Fallback version if package is not installed
+    __version__ = "0.0.0.dev"
+
+from .cli import main as cli_main
+from .configure import main as configure_main
+
+__all__ = ["cli_main", "configure_main"]

{onehouse_cli-0.1.2 → onehouse_cli-0.1.4}/onehouse_cli/cli.py

@@ -44,6 +44,8 @@ def get_profile_credentials(credentials, profile_name):
 def check_request_status(profile_creds, request_id):
     """Check the status of a request using the status endpoint."""
     api_endpoint = profile_creds.get('api_endpoint', 'https://api.onehouse.ai')
+    # Normalize endpoint - remove trailing /v1 if present for backward compatibility
+    api_endpoint = api_endpoint.rstrip('/').removesuffix('/v1')
     url = f"{api_endpoint}/v1/status/{request_id}"
 
     headers = {
@@ -180,6 +182,8 @@ def wait_for_completion(profile_creds, request_id, timeout_minutes=10):
 def execute_command(profile_creds, command, timeout_minutes=10):
     """Execute a command against the Onehouse API and wait for completion."""
     api_endpoint = profile_creds.get('api_endpoint', 'https://api.onehouse.ai')
+    # Normalize endpoint - remove trailing /v1 if present for backward compatibility
+    api_endpoint = api_endpoint.rstrip('/').removesuffix('/v1')
     url = f"{api_endpoint}/v1/resource/"
 
     headers = {
@@ -263,19 +267,22 @@ def list_profiles(credentials):
         account_uid = profile_data.get('account_uid', 'N/A')
         project_uid = profile_data.get('project_uid', 'N/A')
         region = profile_data.get('project_region', 'N/A')
-        environment = profile_data.get('environment', 'production')
+        api_endpoint = profile_data.get('api_endpoint', 'N/A')
 
         default_indicator = " (default)" if profile_name == default_profile else ""
         print(f"  - {profile_name}{default_indicator}")
         print(f"    Account: {account_uid}")
         print(f"    Project: {project_uid}")
         print(f"    Region: {region}")
-        print(f"    Environment: {environment}")
+        print(f"    API Endpoint: {api_endpoint}")
         print()
 
 
 def main():
     """Main function to run the CLI tool."""
+    # Import version here to avoid circular import
+    from . import __version__
+
     parser = argparse.ArgumentParser(
         description='Execute SQL commands against Onehouse API',
         epilog='Examples:\n'
@@ -284,6 +291,12 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter
     )
 
+    parser.add_argument(
+        '--version', '-v',
+        action='version',
+        version=f'onehouse-cli {__version__}'
+    )
+
     parser.add_argument(
         '--command', '-c',
         type=str,

{onehouse_cli-0.1.2 → onehouse_cli-0.1.4}/onehouse_cli/configure.py

@@ -71,7 +71,7 @@ def collect_credentials():
         print(f"    Account: {existing_profile.get('account_uid', 'N/A')}")
         print(f"    Project: {existing_profile.get('project_uid', 'N/A')}")
         print(f"    Region: {existing_profile.get('project_region', 'N/A')}")
-        print(f"    Environment: {existing_profile.get('environment', 'production')}")
+        print(f"    API Endpoint: {existing_profile.get('api_endpoint', 'N/A')}")
 
         # Show API Key/Secret previews in the summary
         existing_key = existing_profile.get('api_key', '')
@@ -164,28 +164,17 @@ def collect_credentials():
             print("Error: Request ID is required")
             return None
 
-    # Environment selection
-    existing_env = existing_profile.get('environment', 'production')
+    # API Endpoint
+    default_endpoint = "https://api.onehouse.ai/v1"
+    existing_endpoint = existing_profile.get('api_endpoint', default_endpoint)
     print()
-    print("Environment Selection:")
-    print("1. Production (api.onehouse.ai)")
-    print("2. Staging (staging-api.onehouse.ai)")
-    prompt = f"Choose environment (1 or 2) ({existing_env}): " if existing_env else "Choose environment (1 or 2): "
-    env_choice = get_user_input(prompt).strip()
-
-    if not env_choice and existing_env:
-        environment = existing_env
-        api_endpoint = existing_profile.get('api_endpoint',
-                                          'https://staging-api.onehouse.ai' if existing_env == 'staging'
-                                          else 'https://api.onehouse.ai')
-    elif env_choice == "2":
-        environment = "staging"
-        api_endpoint = "https://staging-api.onehouse.ai"
-    else:
-        environment = "production"
-        api_endpoint = "https://api.onehouse.ai"
-
-    print(f"Selected: {environment} environment")
+    prompt = f"API Endpoint ({existing_endpoint}): " if existing_endpoint else f"API Endpoint ({default_endpoint}): "
+    api_endpoint = get_user_input(prompt).strip()
+
+    if not api_endpoint:
+        api_endpoint = existing_endpoint if existing_endpoint else default_endpoint
+
+    print(f"Using API endpoint: {api_endpoint}")
 
     credentials[profile_name] = {
         "account_uid": account_uid,
@@ -195,7 +184,6 @@ def collect_credentials():
         "project_region": project_region,
         "user_id": user_id,
         "request_id": request_id,
-        "environment": environment,
         "api_endpoint": api_endpoint
     }
 
@@ -208,77 +196,6 @@ def collect_credentials():
     return credentials, profile_name
 
 
-def is_already_in_shell_profile():
-    """Check if onehouse-cli is already added to shell profile."""
-    cli_dir = Path(__file__).parent.absolute()
-
-    # Detect shell and profile file
-    shell_profiles = [
-        Path.home() / ".zshrc",
-        Path.home() / ".bashrc",
-        Path.home() / ".bash_profile"
-    ]
-
-    for profile_file in shell_profiles:
-        if profile_file.exists():
-            try:
-                with open(profile_file, 'r') as f:
-                    content = f.read()
-                    if str(cli_dir) in content and "onehouse-cli" in content:
-                        return True
-            except IOError:
-                pass
-
-    return False
-
-
-def add_to_shell_profile():
-    """Add onehouse-cli tools to the user's shell profile."""
-    import subprocess
-
-    # Get the directory where the CLI tools are located
-    cli_dir = Path(__file__).parent.absolute()
-    path_export = f'export PATH="{cli_dir}:$PATH"'
-
-    # Detect shell and profile file
-    shell_profiles = [
-        Path.home() / ".zshrc",
-        Path.home() / ".bashrc",
-        Path.home() / ".bash_profile"
-    ]
-
-    profile_file = None
-    for profile in shell_profiles:
-        if profile.exists():
-            profile_file = profile
-            break
-
-    if not profile_file:
-        print("Could not find shell profile file (.zshrc, .bashrc, .bash_profile)")
-        print(f"Manually add this to your shell profile: {path_export}")
-        return
-
-    # Check if already added
-    try:
-        with open(profile_file, 'r') as f:
-            content = f.read()
-            if str(cli_dir) in content and "onehouse-cli" in content:
-                print(f"✓ Already added to {profile_file}")
-                return
-    except IOError:
-        pass
-
-    # Add to profile
-    try:
-        with open(profile_file, 'a') as f:
-            f.write(f"\n# Add onehouse-cli tools to PATH\n{path_export}\n")
-        print(f"✓ Added to {profile_file}")
-        print("Please run 'source ~/.zshrc' (or your shell profile) to apply changes")
-    except IOError as e:
-        print(f"Failed to write to {profile_file}: {e}")
-        print(f"Manually add this to your shell profile: {path_export}")
-
-
 def main():
     """Main function to run the configuration tool."""
     try:
@@ -302,16 +219,7 @@ def main():
         print(f"✓ Profile '{profile_name}' configured successfully!")
         print(f"Credentials saved to: {Path.home() / '.onehouse' / 'credentials'}")
         print()
-
-        # Check if already in shell profile, only ask if not already added
-        if is_already_in_shell_profile():
-            print("✓ onehouse-cli tools already in shell PATH")
-        else:
-            add_to_profile = input("Add onehouse-cli tools to your shell PATH? (y/n): ").strip().lower()
-            if add_to_profile in ['y', 'yes']:
-                add_to_shell_profile()
-
-        print("You can now use this profile with future Onehouse CLI commands.")
+        print("You can now use this profile with Onehouse CLI commands.")
 
         return 0
 

{onehouse_cli-0.1.2 → onehouse_cli-0.1.4}/onehouse_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onehouse-cli
-Version: 0.1.2
+Version: 0.1.4
 Summary: A command-line tool for executing SQL commands against the Onehouse API
 Author-email: Sagar Lakshmipathy <18vidhyasagar@gmail.com>
 License: Proprietary
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 Requires-Dist: requests
+Requires-Dist: importlib-metadata>=1.0; python_version < "3.8"
 
 # Onehouse CLI
 
@@ -43,7 +44,8 @@ This will prompt you for:
 - Project Region
 - User ID
 - Request ID
-- Environment (production or staging)
+- API Endpoint (defaults to `https://api.onehouse.ai/v1`)
+  - Press Enter to use the default endpoint
 
 **Credentials are stored in:** `~/.onehouse/credentials`
 

onehouse_cli-0.1.4/onehouse_cli.egg-info/requires.txt

@@ -0,0 +1,4 @@
+requests
+
+[:python_version < "3.8"]
+importlib-metadata>=1.0

{onehouse_cli-0.1.2 → onehouse_cli-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "onehouse-cli"
-version = "0.1.2"
+version = "0.1.4"
 description = "A command-line tool for executing SQL commands against the Onehouse API"
 readme = "README.md"
 requires-python = ">=3.7"
@@ -25,6 +25,7 @@ classifiers = [
 ]
 dependencies = [
     "requests",
+    "importlib-metadata>=1.0; python_version < '3.8'",
 ]
 
 [project.scripts]

onehouse_cli-0.1.2/onehouse_cli/__init__.py

@@ -1,10 +0,0 @@
-"""
-Onehouse CLI - A command-line tool for executing SQL commands against the Onehouse API.
-"""
-
-__version__ = "0.1.1"
-
-from .cli import main as cli_main
-from .configure import main as configure_main
-
-__all__ = ["cli_main", "configure_main"]

onehouse_cli-0.1.2/onehouse_cli.egg-info/requires.txt

@@ -1 +0,0 @@
-requests