gibson-cli 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

gibson/api/BaseApi.py

@@ -1,33 +1,100 @@
+import os
 import requests
 
+from gibson.core.Configuration import Configuration
+
 
 class BaseApi:
-    def get_headers(self):
-        raise NotImplementedError
+    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 _get(self, end_point):
-        r = requests.get(self.get_url(end_point), headers=self.get_headers())
+    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 _post(self, end_point, json: dict):
-        r = requests.post(
-            self.get_url(end_point), headers=self.get_headers(), json=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, end_point, json: dict):
-        r = requests.put(self.get_url(end_point), headers=self.get_headers(), json=json)
+    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()

gibson/api/Cli.py

@@ -1,7 +1,3 @@
-import os
-import requests
-
-from gibson.services.auth.Server import Server as AuthServer
 from gibson.core.Configuration import Configuration
 from gibson.lang.Python import Python
 from gibson.core.Memory import Memory
@@ -10,22 +6,16 @@ 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):
-        access_token, refresh_token = AuthServer(self.get_app_domain()).get_tokens()
-        return access_token, refresh_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/command/auth/Login.py

@@ -1,11 +1,12 @@
-from gibson.api.Cli import Cli
+from gibson.api.BaseApi import BaseApi
 from gibson.command.BaseCommand import BaseCommand
+from gibson.services.auth.Server import Server as AuthServer
 
 
 class Login(BaseCommand):
     def execute(self):
-        cli = Cli(self.configuration)
-        access_token, refresh_token = cli.login()
+        api = BaseApi(self.configuration)
+        access_token, refresh_token = AuthServer(api.app_domain()).get_tokens()
 
         if access_token is None or refresh_token is None:
             self.conversation.newline()

gibson/core/Completions.py

@@ -10,13 +10,11 @@ class Completions:
         completions_location = f"$HOME/{self.gibson_config}/bash_completion"
         installation = f"""\n[ -s "{completions_location}" ] && \\. "{completions_location}" # Load gibson auto completion\n"""
 
-        with open(f"{self.user_home}/.bashrc", "r+") as f:
-            if completions_location not in f.read():
-                f.write(installation)
-
-        with open(f"{self.user_home}/.zshrc", "r+") as f:
-            if completions_location not in f.read():
-                f.write(installation)
+        for file in [f"{self.user_home}/.bashrc", f"{self.user_home}/.zshrc"]:
+            with open(file, "a+") as f:
+                f.seek(0)
+                if completions_location not in f.read():
+                    f.write(installation)
 
         return self
 
@@ -28,8 +26,12 @@ class Completions:
         except FileNotFoundError:
             return self
 
-        completions = f"{self.user_home}/{self.gibson_config}/bash_completion"
-        with open(completions, "w") as f:
+        try:
+            os.mkdir(f"{self.user_home}/{self.gibson_config}")
+        except FileExistsError:
+            pass
+
+        with open(f"{self.user_home}/{self.gibson_config}/bash_completion", "w") as f:
             f.write(contents)
 
         return self

gibson/core/Configuration.py

@@ -269,6 +269,16 @@ class Configuration:
 
     def get_my_settings(self):
         return self.settings[self.project.name]
+    
+    def get_refresh_token(self):
+        try:
+            with open(f"{self.paths.auth}/{self.API_ENV}", "r") as f:
+                contents = f.read()
+        except FileNotFoundError:
+            return None
+
+        token = json.loads(contents)
+        return token["refresh_token"]
 
     def initialize(self):
         self.conversation.message_welcome()

{gibson_cli-0.1.3.dist-info → gibson_cli-0.1.5.dist-info}/METADATA

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

{gibson_cli-0.1.3.dist-info → gibson_cli-0.1.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
-gibson/api/BaseApi.py,sha256=W5C_Rq-sf_MOwArozYG0ILFL8nyXhSwX84dpLT69o1M,1055
-gibson/api/Cli.py,sha256=4M1KizWG97hxkU-KPGBSGXKA-q8ReTFxIsWGZ2yV-60,8453
+gibson/api/BaseApi.py,sha256=SgEsVvEJ0t4U2jwJ-dp6YLVdBjh15pAOuT_wPQYn_v0,3233
+gibson/api/Cli.py,sha256=WT2EvEwUJgfM2klxKBSMaDFWrO1maImo9LSeJM4-Eho,7146
 gibson/bin/gibson.py,sha256=N1mAWaww9pw8s5u0et87FC5cFHVU6JzN4Kls3lDn-xw,354
 gibson/command/Api.py,sha256=sSvAqEJXdgQjYcu0uiM6ndHE3GnfkfVL6eqP2Otkbww,1002
 gibson/command/Base.py,sha256=eqp9e3XlCpGt4j_aR2htsQnICgkZT6GWeQblCFM792g,819
@@ -32,7 +32,7 @@ gibson/command/Tree.py,sha256=JWvUimeHWY5-6vEh6axTkhAdI-dVTxbKSjx_4isAAx8,3041
 gibson/command/Version.py,sha256=Dbi1Mg56oRahWF-hxfCGFwRUli7vYguoCKKkJv-c7MI,227
 gibson/command/WarGames.py,sha256=V0KIpz-Z546qtQaOPdIVHQ6wp2n3r3M3tgKx-GRQzzU,1300
 gibson/command/auth/Auth.py,sha256=7R4Xt9NrkkSg8yYZeWi0VdhqCCK8ved2JUBdCbrMMZ8,717
-gibson/command/auth/Login.py,sha256=L0lMycs_nPogFHTQ603bsJtEgbXk8EDcnIocKqcU9FI,643
+gibson/command/auth/Login.py,sha256=QpIQirzCAl_bDfV7zZLZKJIj2NGqTzmr6PDN000DIfI,746
 gibson/command/auth/Logout.py,sha256=9fs_iNdJdcdsE7q5Yi0XzqH_A0w8uqP34YZ6PWcZ3Pg,212
 gibson/command/tests/test_command_BaseCommand.py,sha256=hSbBfLFI3RTp_DdEHtm5oOLWoN6drI6ucFJypi7xxV8,364
 gibson/command/tests/test_command_Conf.py,sha256=NhN8tIZ_lwP0fV4jtplaxJbO3GTozsQVmiV5j1BNbxQ,583
@@ -55,8 +55,8 @@ 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/CommandRouter.py,sha256=jYKWpsCQGLjuCPkg7C8PPBnS07AddrUv3APTqB0s2C0,9558
-gibson/core/Completions.py,sha256=r9GL-da-mq2HftWs2rmxnmasMEkJ3MMhzOn02YZE9sE,1116
-gibson/core/Configuration.py,sha256=ruMpEkd_cKTmfPotPWyESXWKUYRrChTeSpNVegzbLS4,14009
+gibson/core/Completions.py,sha256=N-mfeImSzw-d3Lrpu1KVnt0geMuKkbTaHpYTMYcPcAQ,1152
+gibson/core/Configuration.py,sha256=6EX8vh7qf15OB1hDfr2lYyKz6r-nB3KG0ltiax80_dU,14300
 gibson/core/Conversation.py,sha256=rKSfJao5VGj1WyWHjfbKnYqWS9j0fPmDCF5uX9e04zs,8196
 gibson/core/Env.py,sha256=7HFKGah25KjLelyOjYS8ylR6yDScT6utyZe7HdB3aRE,431
 gibson/core/Memory.py,sha256=Anauq7vx883Bg5djoZCVyvAJBQeMtqQLzZtNecJMpZc,3921
@@ -101,8 +101,8 @@ gibson/structure/tests/test_Entity.py,sha256=Gl9f1NcEKdpWCx4W3takFFzp18mLhCYWKrd
 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
-gibson_cli-0.1.3.dist-info/METADATA,sha256=WU7RIR2J3fg92RcjJdC8XMJZNmm2GuIB3WrwSDFBQS8,11437
-gibson_cli-0.1.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-gibson_cli-0.1.3.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.1.3.dist-info/top_level.txt,sha256=GIvzfJmscYHhX9eE-3SJmCIcjF3If-EtcoQdnlmsBuQ,7
-gibson_cli-0.1.3.dist-info/RECORD,,
+gibson_cli-0.1.5.dist-info/METADATA,sha256=T4hgBIfOE1f_0YHtcf4n9vMbJHHKfK12HsgkXj-OLqk,11437
+gibson_cli-0.1.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+gibson_cli-0.1.5.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.1.5.dist-info/top_level.txt,sha256=GIvzfJmscYHhX9eE-3SJmCIcjF3If-EtcoQdnlmsBuQ,7
+gibson_cli-0.1.5.dist-info/RECORD,,