gibson-cli 0.8.1__py3-none-any.whl → 0.8.3__py3-none-any.whl

bin/release.sh

@@ -1,5 +1,5 @@
 sh bin/clean.sh
 sh bin/build.sh
-uv publish
-# python3 -m twine upload --repository pypi dist/*
+read -p "Enter the PyPI token: " token
+uv publish --username __token__ --password $token
 sh bin/clean.sh

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/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/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/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/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/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/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/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/services/mcp/server.py

@@ -1,34 +1,55 @@
 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")
 
-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
 
 
+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"""
-    return project_api.list()
+    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"""
-    return project_api.create()
+    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"""
-    return project_api.lookup(uuid=uuid)
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.lookup(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
 
 
 @mcp.tool()
@@ -37,7 +58,11 @@ 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)
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.mcp(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
 
 
 @mcp.tool()
@@ -47,7 +72,11 @@ def update_project(uuid: str, project_name: str) -> Dict:
     This currently only updates the project's name
     Returns the updated project details
     """
-    return project_api.update(uuid=uuid, name=project_name)
+    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()
@@ -57,7 +86,11 @@ def submit_data_modeling_request(uuid: str, data_modeling_request: str) -> Dict:
     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)
+    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()
@@ -66,7 +99,11 @@ 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)
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.deploy(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
 
 
 @mcp.tool()
@@ -75,7 +112,11 @@ 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)
+    project_api = ProjectApi(Configuration(interactive=False))
+    try:
+        return project_api.schema(uuid=uuid)
+    except HTTPError as e:
+        return error_handler(e)
 
 
 @mcp.tool()
@@ -84,4 +125,21 @@ 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)
+    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.dist-info → gibson_cli-0.8.3.dist-info}/METADATA

@@ -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.dist-info → gibson_cli-0.8.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 bin/build.sh,sha256=aAcWaPJeeFTojf2AYoD--_zS6TRqZcSogvqEezD5Wak,9
 bin/clean.sh,sha256=bVJ1aL-IWconmyZ70OAcF0MHiPzpWCejPiIFJ72yFkM,55
-bin/gibson,sha256=gp8qFxBv1i3iTqDVVIm7hNU2II2DeoMgxnjbi4ofvwA,853
-bin/release.sh,sha256=ghS71QUBWwCqBNKAtpspYvqX46M1cZyUgtOEI4xDLUo,110
-gibson/api/BaseApi.py,sha256=4BZYKcLnIUtxinQuL--qpTRlsorMmpirdf3pW1DzPaI,3735
+bin/release.sh,sha256=6pnY_GctbwF-3sZB67b0nzUlTsxlhY1hqJQoqRutXuw,137
+gibson/api/BaseApi.py,sha256=Wza4yuLHhFjkPxt2dhtUtM_r9b5IGd72V80VDl7v3Gw,3510
 gibson/api/Cli.py,sha256=Qcm5NIQ4x1Wn6KfkrAzwvZeWyt-cKF_xD7_lTWL4Lbw,8071
-gibson/api/ProjectApi.py,sha256=OzOPumgcd9IHqiaa_v52vBfh1RTwJyYuQWcilj52GTI,1255
-gibson/bin/gibson.py,sha256=56fqPBiF47uJvafHyNbWZ4GorcI0Ut98DCXeS7dt2io,420
+gibson/api/DataApi.py,sha256=JZN6q7bO2O87xBCsU9w96NgINOJJZx3d7jOiHoVH1Wo,542
+gibson/api/ProjectApi.py,sha256=1_gRAAgaqblV0I0D-R-wwgSQArQ4fSCxTDfTO3zDQzY,1212
+gibson/bin/gibson.py,sha256=ybtdrqLfmTb-gG2U7kWSHWSZDvc864omYR9vres38ZU,458
 gibson/command/BaseCommand.py,sha256=mmWUO0FxjMCbv3cHWnnasfAWnU_hTuGHUsRVJ4hUcqM,777
 gibson/command/Build.py,sha256=6lMdTa3HZvcbskoX8iJZJnekiJmyNVSbgGmgvh1v-BM,4421
 gibson/command/Conf.py,sha256=yuAGL6M8MUURG4hW3MAW043c-h_ALw3FHWbyCOR8YTQ,2375
@@ -22,7 +22,7 @@ gibson/command/Tree.py,sha256=BeJ_13xrrRCK5FP2rQHWpDKrshVzte-_D1pNG1GXPIw,3056
 gibson/command/Version.py,sha256=jxkRdbQiyTdto18RpbL-5vudcbvLLX9kcl8vmkt7USw,1187
 gibson/command/auth/Auth.py,sha256=DAvnKq3Ks77QJwuGJCWA9Iv3c0Qq5pHFIpEA-gy6CxM,1086
 gibson/command/auth/Login.py,sha256=b43OfV76i6aGdOwj1NK64ZOdYlNyc08g3lZGQ_37KDw,437
-gibson/command/auth/Logout.py,sha256=V01q4TdbiBqCnIrM6IA4T25fO6ws0UpXp42I3pwHZVM,248
+gibson/command/auth/Logout.py,sha256=QwW9pCNi61Ak0-1B-3spd_YlsmLYBxzV4uwyO0RYzxg,252
 gibson/command/code/Api.py,sha256=sSvAqEJXdgQjYcu0uiM6ndHE3GnfkfVL6eqP2Otkbww,1002
 gibson/command/code/Base.py,sha256=YJ2a5Hl0f9NXHUBBPvlt-dUIqEPWQz5vH6-1EHmbFbA,640
 gibson/command/code/Code.py,sha256=j6RetYcg3RQcpD7lA0MRDof9A9drHPDeGjdsslQtLvM,3773
@@ -38,7 +38,7 @@ gibson/command/importer/OpenApi.py,sha256=5PL4JlhniPhUidOFxKpC9ao_r8C_qIeCoGyliP
 gibson/command/list/Entities.py,sha256=o5Wemlq_EpeObNwJHbCqkUT4nccfu_OOZ_gYWzJ051Y,1223
 gibson/command/list/List.py,sha256=IA9VYuOiFdweg-6HIBZ5hECnMyNxsoU2dKd-gzRNtio,1107
 gibson/command/list/Projects.py,sha256=ju82kC3cuvAMGg4YJl1yn0l8t11fa1T5Zvgkl_p9m9U,1194
-gibson/command/mcp/McpServer.py,sha256=fzeo6gQU0eZL9LA0w5iC1I-wATufIyh23zA7oiYRtGM,810
+gibson/command/mcp/McpServer.py,sha256=LiKPGtxpdGHJQP280tmqhnUOvdJboF6UtoQggKQHVJg,881
 gibson/command/new/Module.py,sha256=PCTt6k54XFzgNjNgwY0FKQFzk0YFoaN_KPZF2sfN_V0,1535
 gibson/command/new/New.py,sha256=cwsBpZAZH-9se26ywAUFyvrc9L9ezwoERIrRLlDkrzU,1519
 gibson/command/new/Project.py,sha256=Cw1Z6TvPIGhTi7GiQZ2VFjv6hXdpGKQdX9HuAd5gric,759
@@ -66,9 +66,9 @@ gibson/conf/dev/Schema.py,sha256=kOSlX1jEyVb82xd8TO8jEAimLcaefIFJr6d2JYvyTqg,74
 gibson/conf/tests/test_conf_Dependencies.py,sha256=LITeeYiqXM5rKkyWFBqcnMvUR5pzDRuHVAngH372jWc,116
 gibson/conf/tests/test_conf_Platform.py,sha256=Zc53IsZmV-hT9VRrZEPNrsuehSdWnJXWKGMmOhEqWHo,138
 gibson/core/Colors.py,sha256=sllEmJAb2AAUH0e-ZLP1_C8pfz5U_w0fo5kubSH5g1o,3426
-gibson/core/CommandRouter.py,sha256=P64NCzC2noHauV_cdMU1IzfjgHe1zezDadviaPs3Cds,3320
+gibson/core/CommandRouter.py,sha256=V7awLSPjOx2GQqJNoHQSFsiA2uFkrxtpysyTDbyPloA,3442
 gibson/core/Completions.py,sha256=a26WRh40UpnTT5HGTPT8TCcL8h80HvvZiTJXZofDjx8,1207
-gibson/core/Configuration.py,sha256=xUul0ckr92e7uvn5t3YM1w6n3uGytvs6l69kx9EotIc,16404
+gibson/core/Configuration.py,sha256=5nO4hY1MvVQapt37RbwrJpc9zwUx6u86n1BRRbIgjUQ,16586
 gibson/core/Conversation.py,sha256=KF7YPXijhhz6HOkife__ycHox4WeRKNHIpv3juDPhq0,10237
 gibson/core/Diff.py,sha256=onUJ5_0_S1vKAY_oFgX4vmwQo4byrnXLV4w7QSNA8fY,1071
 gibson/core/Env.py,sha256=08dZRHzzR0ahrbM4S0bXC7V1xhYQkT8Zefs00qUHf0U,498
@@ -106,7 +106,7 @@ gibson/services/code/customization/CustomizationManager.py,sha256=M2gz98Yo2WTnnh
 gibson/services/code/customization/Index.py,sha256=4Thf0gZM6VErZJS97w748PRNmHi8QvsyblOLCw1Y_XE,364
 gibson/services/code/customization/tests/test_code_customization_Authenticator.py,sha256=kKExkLfKPpRA2NQH3fvRCuBEMhCGhR-IvNJqXuyBz3c,1949
 gibson/services/code/customization/tests/test_code_customization_BaseCustomization.py,sha256=jaEwxxoU7d9ziOtfF21NPmZX2qSRpa-kz_8Ju9BKGts,412
-gibson/services/mcp/server.py,sha256=rIgT9W05wB2hen6v0QQ2J_B9VyJb8htE3tPLTR5Q5FI,2494
+gibson/services/mcp/server.py,sha256=pmJrZ2A1U33Y_UMCA6kgvIoqUZju3m8fLLfOjaAo_oM,4533
 gibson/structure/Entity.py,sha256=N_Tx8RTs9ySMMgAoR9rVuMcsRgNA7zvNvJBScJLfYE4,675
 gibson/structure/mysql/Entity.py,sha256=zolt3N_F3WlQtlOqrHflwsJeJ6r6A3MN4LxCzeAbU_k,3693
 gibson/structure/mysql/testing.py,sha256=al4LI6e3bhjopsR0qTAmaOJyCQXF0_inVQ4xv7VQ6qo,9149
@@ -129,8 +129,8 @@ gibson/tests/test_Env.py,sha256=DPWmP0-aEelducq9bAwv7rKoY2NjWXUeCrzfJDQkn2M,369
 gibson/tests/test_Memory.py,sha256=YP7owToABAk_-s7fD5UG0HTc4lamDjdA39JUlLnk3Fg,2574
 gibson/tests/test_utils.py,sha256=r_y-EG05YTCNtL8MWiAK1KmPsmeoMgypKsQC_lVgOtM,559
 venv/bin/activate_this.py,sha256=E1T7r3559tBsyqFpdcQW0HbY7gDvNiIv5Pc6HQ4bpoA,2383
-gibson_cli-0.8.1.dist-info/METADATA,sha256=9PkfewFxUDz75qzIG7HUXAbjraHB0aPDbS6D8cN5aBg,14592
-gibson_cli-0.8.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gibson_cli-0.8.1.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.8.1.dist-info/top_level.txt,sha256=fSV3vegbdbSDwiB6n5z3FCeYwkIonzFrx4ek3F_OSdI,16
-gibson_cli-0.8.1.dist-info/RECORD,,
+gibson_cli-0.8.3.dist-info/METADATA,sha256=NJ34YJ9UIbKeQMbn2dkE4jXy1gykNNsNZ3l0_kR67tU,14592
+gibson_cli-0.8.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+gibson_cli-0.8.3.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.8.3.dist-info/top_level.txt,sha256=fSV3vegbdbSDwiB6n5z3FCeYwkIonzFrx4ek3F_OSdI,16
+gibson_cli-0.8.3.dist-info/RECORD,,

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())