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

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

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

gibson_cli-0.1.4/gibson/api/BaseApi.py

@@ -0,0 +1,112 @@
+import os
+import requests
+
+from gibson.core.Configuration import Configuration
+
+
+class BaseApi:
+    API_ENV = os.environ.get("GIBSONAI_API_ENV", "staging")
+    VERSION = "v1"
+
+    def __init__(self, configuration: Configuration):
+        self.configuration = configuration
+
+    def api_domain(self):
+        domains = {
+            "local": "http://localhost:8000",
+            "staging": "https://staging-api.gibsonai.com",
+            "production": "https://api.gibsonai.com",
+        }
+        return domains[self.API_ENV]
+
+    def app_domain(self):
+        domains = {
+            "local": "http://localhost:5173",
+            "staging": "https://staging-app.gibsonai.com",
+            "production": "https://app.gibsonai.com",
+        }
+        return domains[self.API_ENV]
+
+    def base_url(self):
+        return f"{self.api_domain()}/{self.VERSION}"
+
+    def client_id(self):
+        return {
+            "local": "9b0cbebd-3eb4-47be-89ac-4aa589316ff4",
+            "staging": "02459e16-f356-4c01-b689-59847ed04b0a",
+            "production": "da287371-240b-4b53-bfde-4b1581cca62a",
+        }[self.API_ENV]
+
+    def get(self, endpoint):
+        r = requests.get(self.url(endpoint), headers=self.headers())
+
+        if r.status_code == 401 and self.refresh_auth_tokens():
+            r = requests.get(self.url(endpoint), headers=self.headers())
+
+        self.__raise_for_status(r)
+
+        return r.json()
+
+    def headers(self):
+        raise NotImplementedError
+
+    def post(self, endpoint, json: dict):
+        r = requests.post(self.url(endpoint), headers=self.headers(), json=json)
+
+        if r.status_code == 401 and self.refresh_auth_tokens():
+            r = requests.post(self.url(endpoint), headers=self.headers(), json=json)
+
+        self.__raise_for_status(r)
+
+        return r
+
+    def put(self, endpoint, json: dict):
+        r = requests.put(self.url(endpoint), headers=self.headers(), json=json)
+
+        if r.status_code == 401 and self.refresh_auth_tokens():
+            r = requests.put(self.url(endpoint), headers=self.headers(), json=json)
+
+        self.__raise_for_status(r)
+
+        return r
+
+    def refresh_auth_tokens(self):
+        refresh_token = self.configuration.get_refresh_token()
+        if not refresh_token:
+            return False
+
+        r = requests.post(
+            f"{self.base_url()}/auth/token/refresh",
+            headers=self.headers(),
+            json={"refresh_token": refresh_token},
+        )
+
+        if r.status_code != 200:
+            return False
+
+        parsed = r.json()
+        self.configuration.set_auth_tokens(
+            parsed["access_token"], parsed["refresh_token"]
+        )
+        return True
+
+    def url(self, endpoint):
+        if self.PREFIX:
+            return f"{self.base_url()}/{self.PREFIX}/{endpoint}"
+        return f"{self.base_url()}/{endpoint}"
+
+    def __raise_for_status(self, r):
+        try:
+            r.raise_for_status()
+        except:
+            try:
+                message = r.json()
+
+                print("=" * 78)
+                print("Raw Response:\n")
+                print(message)
+                print("\n" + "=" * 78)
+            except requests.exceptions.JSONDecodeError:
+                pass
+
+            raise

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/api/Cli.py

@@ -1,31 +1,21 @@
-import os
-import requests
-
-from services.auth.Server import Server as AuthServer
-from core.Configuration import Configuration
-from lang.Python import Python
-from core.Memory import Memory
+from gibson.core.Configuration import Configuration
+from gibson.lang.Python import Python
+from gibson.core.Memory import Memory
 
 from .BaseApi import BaseApi
 
 
 class Cli(BaseApi):
-    API_ENV = os.environ.get("GIBSONAI_API_ENV", "staging")
     PREFIX = "cli"
-    VERSION = "v1"
-
-    def __init__(self, configuration: Configuration):
-        super().__init__()
-        self.configuration = configuration
 
     def code_api(self):
-        return self._post(
+        return self.post(
             "code/api",
             self.__structure_context_payload(self.configuration, with_stored=True),
         ).json()
 
     def code_base(self):
-        return self._post(
+        return self.post(
             "code/base",
             self.__structure_context_payload(self.configuration, with_stored=True),
         ).json()
@@ -35,25 +25,25 @@ class Cli(BaseApi):
         payload["model"] = {"name": model_name}
         payload["q"] = instructions
 
-        return self._post("code/model/attributes", payload).json()
+        return self.post("code/model/attributes", payload).json()
 
     def code_models(self, entities: list):
         payload = self.__structure_context_payload(self.configuration, with_stored=True)
         payload["entities"] = entities
 
-        return self._post("code/models", payload).json()
+        return self.post("code/models", payload).json()
 
     def code_schemas(self, entities: list):
         payload = self.__structure_context_payload(self.configuration, with_stored=True)
         payload["entities"] = entities
 
-        return self._post("code/schemas", payload).json()
+        return self.post("code/schemas", payload).json()
 
     def code_testing(self, entities: list):
         payload = self.__structure_context_payload(self.configuration, with_stored=True)
         payload["entities"] = entities
 
-        return self._post("code/testing", payload).json()
+        return self.post("code/testing", payload).json()
 
     def code_writer_entity_modifier(self, context, name, definition, instructions):
         payload = self.__structure_context_payload(self.configuration)
@@ -61,38 +51,17 @@ class Cli(BaseApi):
         payload["entity"] = {"definition": definition, "name": name}
         payload["q"] = instructions
 
-        return self._post("code/writer/entity/modifier", payload).json()
+        return self.post("code/writer/entity/modifier", payload).json()
 
     def code_writer_schema_context(self):
-        return self._post(
+        return self.post(
             "code/writer/schema/context",
             self.__structure_context_payload(self.configuration, with_stored=True),
         ).json()
 
-    def get_client_id(self):
-        return {
-            "local": "9b0cbebd-3eb4-47be-89ac-4aa589316ff4",
-            "staging": "02459e16-f356-4c01-b689-59847ed04b0a",
-            "production": "da287371-240b-4b53-bfde-4b1581cca62a",
-        }[self.API_ENV]
-
-    def get_api_domain(self):
-        return {
-            "local": "http://localhost:8000",
-            "staging": "https://staging-api.gibsonai.com",
-            "production": "https://api.gibsonai.com",
-        }[self.API_ENV]
-
-    def get_app_domain(self):
-        return {
-            "local": "http://localhost:5173",
-            "staging": "https://staging-app.gibsonai.com",
-            "production": "https://app.gibsonai.com",
-        }[self.API_ENV]
-
-    def get_headers(self):
+    def headers(self):
         headers = {
-            "X-Gibson-Client-ID": self.get_client_id(),
+            "X-Gibson-Client-ID": self.client_id(),
             "X-Gibson-API-Key": self.configuration.project.api.key,
         }
 
@@ -102,15 +71,12 @@ class Cli(BaseApi):
 
         return headers
 
-    def get_url(self, end_point):
-        return f"{self.get_api_domain()}/{self.VERSION}/{self.PREFIX}/{end_point}"
-
     def import_(self):
-        return self._get("import")
+        return self.get("import")
 
     def llm_query(self, instructions, has_file, has_python, has_sql):
         project_config = self.configuration.project
-        r = self._post(
+        r = self.post(
             "llm/query",
             {
                 "content": {
@@ -133,14 +99,10 @@ class Cli(BaseApi):
 
         return r.json()
 
-    def login(self):
-        token = AuthServer(self.get_app_domain()).get_token()
-        return token
-
     def modeler_entity_modify(
         self, modeler_version, project_description, entity: dict, modifications: str
     ):
-        r = self._put(
+        r = self.put(
             "modeler/entity/modify",
             {
                 "entity": entity,
@@ -153,7 +115,7 @@ class Cli(BaseApi):
         return r.json()
 
     def modeler_entity_remove(self, modeler_version, entities: list, entity_name):
-        r = self._put(
+        r = self.put(
             "modeler/entity/remove",
             {
                 "entity": {"name": entity_name},
@@ -165,7 +127,7 @@ class Cli(BaseApi):
         return r.json()
 
     def modeler_entity_rename(self, modeler_version, entities: list, current, new):
-        r = self._put(
+        r = self.put(
             "modeler/entity/rename",
             {
                 "entity": {"current": current, "new": new},
@@ -177,7 +139,7 @@ class Cli(BaseApi):
         return r.json()
 
     def modeler_module(self, modeler_version, project_description, module):
-        r = self._post(
+        r = self.post(
             "modeler/module",
             {
                 "modeler": {"version": modeler_version},
@@ -189,7 +151,7 @@ class Cli(BaseApi):
         return r.json()
 
     def modeler_openapi(self, modeler_version, contents):
-        r = self._post(
+        r = self.post(
             "modeler/openapi",
             {"contents": contents, "modeler": {"version": modeler_version}},
         )
@@ -197,7 +159,7 @@ class Cli(BaseApi):
         return r.json()
 
     def modeler_reconcile(self, modeler_version, entities: list):
-        r = self._post(
+        r = self.post(
             "modeler/reconcile",
             {"modeler": {"version": modeler_version}, "schema_": entities},
         )

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/bin/gibson.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-from core.CommandRouter import CommandRouter
-from core.Configuration import Configuration
+from gibson.core.CommandRouter import CommandRouter
+from gibson.core.Configuration import Configuration
 
 
 def main():

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Api.py

@@ -1,9 +1,8 @@
-from api.Cli import Cli
-from dev.Dev import Dev
-from services.code.customization.Authenticator import Authenticator
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
+from gibson.services.code.customization.Authenticator import Authenticator
 
 
 class Api(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Base.py

@@ -1,8 +1,7 @@
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
 
 
 class Base(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/BaseCommand.py

@@ -1,5 +1,5 @@
-from core.Configuration import Configuration
-from core.Memory import Memory
+from gibson.core.Configuration import Configuration
+from gibson.core.Memory import Memory
 
 
 class BaseCommand:

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Build.py

@@ -3,9 +3,8 @@ import sys
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from db.TableExceptions import TableExceptions
-
-from .BaseCommand import BaseCommand
+from gibson.command.BaseCommand import BaseCommand
+from gibson.db.TableExceptions import TableExceptions
 
 
 class Build(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Code.py

@@ -3,17 +3,18 @@ import re
 import sys
 from string import Template
 
-from api.Cli import Cli
-from core.Configuration import Configuration
-from display.Header import Header
-from display.WorkspaceFooter import WorkspaceFooter
-from display.WorkspaceHeader import WorkspaceHeader
-from services.code.context.schema.Manager import Manager as CodeContextSchemaManager
-from structure.Entity import Entity
-
-from .BaseCommand import BaseCommand
-from .Merge import Merge
-from .Rewrite import Rewrite
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.Merge import Merge
+from gibson.command.Rewrite import Rewrite
+from gibson.core.Configuration import Configuration
+from gibson.display.Header import Header
+from gibson.display.WorkspaceFooter import WorkspaceFooter
+from gibson.display.WorkspaceHeader import WorkspaceHeader
+from gibson.services.code.context.schema.Manager import (
+    Manager as CodeContextSchemaManager,
+)
+from gibson.structure.Entity import Entity
 
 
 class Code(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Conf.py

@@ -1,6 +1,6 @@
 import sys
 
-from .BaseCommand import BaseCommand
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Conf(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Dev.py

@@ -1,9 +1,8 @@
 import os
 import sys
 
-from lang.Python import Python
-
-from .BaseCommand import BaseCommand
+from gibson.command.BaseCommand import BaseCommand
+from gibson.lang.Python import Python
 
 
 class Dev(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Import.py

@@ -3,11 +3,10 @@ import sys
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from api.Cli import Cli
-from db.TableExceptions import TableExceptions
-
-from .BaseCommand import BaseCommand
-from .Rewrite import Rewrite
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.Rewrite import Rewrite
+from gibson.db.TableExceptions import TableExceptions
 
 
 class Import(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/List.py

@@ -1,8 +1,7 @@
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class List(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Merge.py

@@ -1,8 +1,7 @@
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Merge(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Model.py

@@ -1,10 +1,9 @@
 import sys
 
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
 
 
 class Model(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Models.py

@@ -1,8 +1,7 @@
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
 
 
 class Models(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Modify.py

@@ -1,8 +1,7 @@
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Modify(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Module.py

@@ -1,9 +1,8 @@
 import re
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Module(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/New.py

@@ -2,9 +2,8 @@ import os
 import re
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class New(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/OpenApi.py

@@ -2,9 +2,8 @@ import json
 import re
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class OpenApi(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Question.py

@@ -1,9 +1,8 @@
 import os
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Question(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Remove.py

@@ -1,9 +1,8 @@
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
-from .Rewrite import Rewrite
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.Rewrite import Rewrite
 
 
 class Remove(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Rename.py

@@ -1,9 +1,8 @@
 import sys
 
-from api.Cli import Cli
-
-from .BaseCommand import BaseCommand
-from .Rewrite import Rewrite
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.Rewrite import Rewrite
 
 
 class Rename(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Rewrite.py

@@ -1,9 +1,9 @@
 import os
 import shutil
 
-from core.Configuration import Configuration
-from services.code.customization.CustomizationManager import CustomizationManager
-from core.TimeKeeper import TimeKeeper
+from gibson.core.Configuration import Configuration
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.services.code.customization.CustomizationManager import CustomizationManager
 
 from .Api import Api
 from .Base import Base

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Schema.py

@@ -1,10 +1,9 @@
 import sys
 
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
+from gibson.dev.Dev import Dev
 
 
 class Schema(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Schemas.py

@@ -1,8 +1,7 @@
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.dev.Dev import Dev
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
 
 
 class Schemas(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Test.py

@@ -1,10 +1,9 @@
 import sys
 
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.dev.Dev import Dev
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
 
 
 class Test(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.4/gibson}/command/Tests.py

@@ -1,8 +1,7 @@
-from api.Cli import Cli
-from dev.Dev import Dev
-from core.TimeKeeper import TimeKeeper
-
-from .BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.dev.Dev import Dev
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.TimeKeeper import TimeKeeper
 
 
 class Tests(BaseCommand):