gibson-cli 0.8.1__tar.gz → 0.8.3__tar.gz

{gibson_cli-0.8.1/gibson_cli.egg-info → gibson_cli-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gibson-cli
-Version: 0.8.1
+Version: 0.8.3
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/

gibson_cli-0.8.3/bin/release.sh

@@ -0,0 +1,5 @@
+sh bin/clean.sh
+sh bin/build.sh
+read -p "Enter the PyPI token: " token
+uv publish --username __token__ --password $token
+sh bin/clean.sh

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/api/BaseApi.py

@@ -2,7 +2,6 @@ import pprint
 
 import requests
 
-import gibson.core.Colors as Colors
 from gibson.core.Configuration import Configuration
 
 
@@ -103,10 +102,7 @@ class BaseApi:
 
     def __raise_for_status(self, r):
         if r.status_code == 401:
-            self.configuration.conversation.type(
-                f"\nYou need to log in to continue. Please run {Colors.command(self.configuration.command, 'auth', args='login')} and then try again.\n"
-            )
-            exit(1)
+            self.configuration.login_required()
 
         try:
             r.raise_for_status()

gibson_cli-0.8.3/gibson/api/DataApi.py

@@ -0,0 +1,18 @@
+from gibson.api.BaseApi import BaseApi
+from gibson.core.Configuration import Configuration
+
+
+class DataApi(BaseApi):
+    PREFIX = "-"
+
+    def __init__(self, configuration: Configuration, api_key: str):
+        self.configuration = configuration
+        self.api_key = api_key or self.configuration.project.api.key
+
+    def headers(self):
+        headers = super().headers()
+        headers["X-Gibson-API-Key"] = self.api_key
+        return headers
+
+    def query(self, query: str):
+        return self.post("query", {"query": query}).json()

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/api/ProjectApi.py

@@ -7,7 +7,6 @@ class ProjectApi(BaseApi):
 
     def __init__(self, configuration: Configuration):
         self.configuration = configuration
-        self.configuration.require_login()
 
     def list(self):
         return self.get()["projects"]

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/bin/gibson.py

@@ -1,16 +1,18 @@
 #!/usr/bin/env python3
 
+import os
+
 from gibson.core.CommandRouter import CommandRouter
 from gibson.core.Configuration import Configuration
+from gibson.display.Header import Header
 
 
 def main():
+    if os.getenv("GIBSON_CLI_DEV"):
+        print(f"{Header().render('dev mode')}\n")
     try:
         configuration = Configuration()
-        if configuration.settings is None:
-            configuration.initialize()
-        else:
-            CommandRouter(configuration).run()
+        CommandRouter(configuration).run()
     except KeyboardInterrupt:
         exit(1)
 

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/command/auth/Logout.py

@@ -3,6 +3,6 @@ from gibson.command.BaseCommand import BaseCommand
 
 class Logout(BaseCommand):
     def execute(self):
-        self.configuration.set_access_token(None)
-        self.conversation.type(f"You are now logged out.")
+        self.configuration.set_auth_tokens(None, None)
+        self.conversation.type("You are now logged out.")
         self.conversation.newline()

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/command/mcp/McpServer.py

@@ -12,6 +12,7 @@ class McpServer(BaseCommand):
             # Setup signal handlers to exit the server
             signal.signal(signal.SIGTERM, lambda signo, frame: sys.exit(0))
             signal.signal(signal.SIGINT, lambda signo, frame: sys.exit(0))
+            self.conversation.type("GibsonAI MCP server running...\n")
             mcp.run()
         else:
             self.usage()

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/core/CommandRouter.py

@@ -33,7 +33,10 @@ class CommandRouter:
 
     def run(self):
         if len(sys.argv) == 1:
-            Help(self.configuration).execute()
+            if self.configuration.settings is None:
+                self.configuration.initialize()
+            else:
+                Help(self.configuration).execute()
             return self
 
         Env().verify(self.configuration)

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson/core/Configuration.py

@@ -17,11 +17,12 @@ class Configuration:
     VERSION = 2
     API_ENV = os.environ.get("GIBSONAI_API_ENV", "production")
 
-    def __init__(self):
+    def __init__(self, interactive=True):
         self.command = None
         if len(sys.argv) >= 1:
             self.command = sys.argv[0].split("/")[-1]
 
+        self.interactive = interactive
         self.conversation = Conversation()
         self.platform = Platform()
         self.project = None
@@ -132,7 +133,7 @@ class Configuration:
                 os.remove(test_file)
 
                 return path
-            except:
+            except Exception:
                 self.conversation.newline()
                 self.conversation.type(
                     "    Well this is embarrassing. I cannot write to that path.\n"
@@ -304,6 +305,13 @@ class Configuration:
         self.set_auth_tokens(access_token, refresh_token)
         return True
 
+    def login_required(self):
+        if self.interactive:
+            self.conversation.message_login_required(self)
+            exit(1)
+
+        return self
+
     def read_config(self):
         try:
             with open(self.paths.config, "r") as f:
@@ -317,8 +325,7 @@ class Configuration:
 
     def require_login(self):
         if self.get_access_token() is None:
-            self.conversation.message_login_required(self)
-            exit(1)
+            self.login_required()
 
         return self
 

gibson_cli-0.8.3/gibson/services/mcp/server.py

@@ -0,0 +1,145 @@
+from typing import Dict, List
+
+from mcp.server.fastmcp import FastMCP
+from requests.exceptions import HTTPError
+
+from gibson.api.DataApi import DataApi
+from gibson.api.ProjectApi import ProjectApi
+from gibson.core.Configuration import Configuration
+
+mcp = FastMCP("GibsonAI")
+
+# Note: Resources are not yet supported by Cursor, everything must be implemented as a tool
+# See https://docs.cursor.com/context/model-context-protocol#limitations
+
+
+def error_handler(e: HTTPError) -> Dict:
+    """Handle HTTP errors from the API"""
+    status_code = e.response.status_code
+    message = e.response.json()
+    if status_code == 401:
+        message = "Authentication required. Run `uvx --from gibson-cli@latest gibson auth login` to authenticate then try again."
+    return {"status_code": status_code, "error": message}
+
+
+@mcp.tool()
+def get_projects() -> List[Dict]:
+    """Get all GibsonAI projects"""
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.list()
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def create_project() -> Dict:
+    """Create a new GibsonAI project"""
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.create()
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def get_project_details(uuid: str) -> Dict:
+    """Get a GibsonAI project's details"""
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.lookup(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def get_project_hosted_api_details(uuid: str) -> str:
+    """
+    Get a GibsonAI project's hosted API details
+    This includes necessary context for an LLM to understand and generate API calls related to fetching or modifying the project's data
+    """
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.mcp(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def update_project(uuid: str, project_name: str) -> Dict:
+    """
+    Update a GibsonAI project's details
+    This currently only updates the project's name
+    Returns the updated project details
+    """
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.update(uuid=uuid, name=project_name)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def submit_data_modeling_request(uuid: str, data_modeling_request: str) -> Dict:
+    """
+    Submit a data modeling request for a GibsonAI project
+    This tool fully handles all data modeling, you should provide the user's request as-is
+    Returns the response from the LLM
+    """
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.submit_message(uuid=uuid, message=data_modeling_request)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def deploy_project(uuid: str) -> None:
+    """
+    Deploy a GibsonAI project's hosted databases
+    This deploys both the development and production databases simultaneously and automatically handles the migrations
+    """
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.deploy(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def get_project_schema(uuid: str) -> str:
+    """
+    Get the schema for a GibsonAI project
+    This includes any changes made to the schema since the last deployment
+    """
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.schema(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def get_deployed_schema(uuid: str) -> str:
+    """
+    Get the deployed schema for a GibsonAI project
+    This is the schema that is currently live on the project's hosted databases
+    """
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.database_schema(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
+
+
+@mcp.tool()
+def query_database(api_key: str, query: str) -> List[Dict] | None | Dict:
+    """
+    Query a GibsonAI project's hosted database using SQL
+    Note: the environment-specific API key must be provided
+    """
+    data_api = DataApi(Configuration(interactive=False), api_key=api_key)
+    try:
+        return data_api.query(query=query)
+    except HTTPError as e:
+        return error_handler(e)

{gibson_cli-0.8.1 → gibson_cli-0.8.3/gibson_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gibson-cli
-Version: 0.8.1
+Version: 0.8.3
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/gibson_cli.egg-info/SOURCES.txt

@@ -5,10 +5,10 @@ pyproject.toml
 requirements.txt
 bin/build.sh
 bin/clean.sh
-bin/gibson
 bin/release.sh
 gibson/api/BaseApi.py
 gibson/api/Cli.py
+gibson/api/DataApi.py
 gibson/api/ProjectApi.py
 gibson/bin/gibson.py
 gibson/command/BaseCommand.py

{gibson_cli-0.8.1 → gibson_cli-0.8.3}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
   "Intended Audience :: Developers",
   "Programming Language :: Python :: 3.10",
 ]
-version = "0.8.1"
+version = "0.8.3"
 
 [tool.setuptools.packages.find]
 where = ["."]

gibson_cli-0.8.1/bin/gibson

@@ -1,26 +0,0 @@
-#!/Library/Frameworks/Python.framework/Versions/3.9/bin/python3.9
-# -*- coding: utf-8 -*-
-
-# This file is identical to what pip creates when you install an executable package, but it adds a dev mode banner.
-# To easily switch between dev mode and installed mode, add the following functions to your .zshrc or .bashrc:
-#
-# cli_dev_on() {
-#   export PATH="$HOME/src/gibson/cli/bin:$PATH"
-#   export PYTHONPATH="$HOME/src/gibson/cli:$PYTHONPATH"
-# }
-#
-# cli_dev_off() {
-#   export PATH=${PATH//$HOME\/src\/gibson\/cli\/bin:/}
-#   export PYTHONPATH=${PYTHONPATH//$HOME\/src\/gibson\/cli:/}
-# }
-
-import re
-import sys
-
-from gibson.bin.gibson import main
-from gibson.display.Header import Header
-
-if __name__ == "__main__":
-    print(f"{Header().render('dev mode')}\n")
-    sys.argv[0] = re.sub(r"(-script\.pyw|\.exe)?$", "", sys.argv[0])
-    sys.exit(main())

gibson_cli-0.8.1/bin/release.sh

@@ -1,5 +0,0 @@
-sh bin/clean.sh
-sh bin/build.sh
-uv publish
-# python3 -m twine upload --repository pypi dist/*
-sh bin/clean.sh

gibson_cli-0.8.1/gibson/services/mcp/server.py

@@ -1,87 +0,0 @@
-from typing import Dict, List
-
-from mcp.server.fastmcp import FastMCP
-
-from gibson.api.ProjectApi import ProjectApi
-from gibson.core.Configuration import Configuration
-
-mcp = FastMCP("GibsonAI")
-
-project_api = ProjectApi(Configuration())
-
-# Note: Resources are not yet supported by Cursor, everything must be implemented as a tool
-# See https://docs.cursor.com/context/model-context-protocol#limitations
-
-
-@mcp.tool()
-def get_projects() -> List[Dict]:
-    """Get all GibsonAI projects"""
-    return project_api.list()
-
-
-@mcp.tool()
-def create_project() -> Dict:
-    """Create a new GibsonAI project"""
-    return project_api.create()
-
-
-@mcp.tool()
-def get_project_details(uuid: str) -> Dict:
-    """Get a GibsonAI project's details"""
-    return project_api.lookup(uuid=uuid)
-
-
-@mcp.tool()
-def get_project_hosted_api_details(uuid: str) -> str:
-    """
-    Get a GibsonAI project's hosted API details
-    This includes necessary context for an LLM to understand and generate API calls related to fetching or modifying the project's data
-    """
-    return project_api.mcp(uuid=uuid)
-
-
-@mcp.tool()
-def update_project(uuid: str, project_name: str) -> Dict:
-    """
-    Update a GibsonAI project's details
-    This currently only updates the project's name
-    Returns the updated project details
-    """
-    return project_api.update(uuid=uuid, name=project_name)
-
-
-@mcp.tool()
-def submit_data_modeling_request(uuid: str, data_modeling_request: str) -> Dict:
-    """
-    Submit a data modeling request for a GibsonAI project
-    This tool fully handles all data modeling, you should provide the user's request as-is
-    Returns the response from the LLM
-    """
-    return project_api.submit_message(uuid=uuid, message=data_modeling_request)
-
-
-@mcp.tool()
-def deploy_project(uuid: str) -> None:
-    """
-    Deploy a GibsonAI project's hosted databases
-    This deploys both the development and production databases simultaneously and automatically handles the migrations
-    """
-    project_api.deploy(uuid=uuid)
-
-
-@mcp.tool()
-def get_project_schema(uuid: str) -> str:
-    """
-    Get the schema for a GibsonAI project
-    This includes any changes made to the schema since the last deployment
-    """
-    return project_api.schema(uuid=uuid)
-
-
-@mcp.tool()
-def get_deployed_schema(uuid: str) -> str:
-    """
-    Get the deployed schema for a GibsonAI project
-    This is the schema that is currently live on the project's hosted databases
-    """
-    return project_api.database_schema(uuid=uuid)