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

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

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

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

@@ -1,10 +1,10 @@
 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.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
 
 from .BaseApi import BaseApi
 
@@ -134,8 +134,8 @@ class Cli(BaseApi):
         return r.json()
 
     def login(self):
-        token = AuthServer(self.get_app_domain()).get_token()
-        return token
+        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

{gibson_cli-0.1.2 → gibson_cli-0.1.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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.3/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):

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/Version.py

@@ -1,5 +1,5 @@
-from conf.Version import Version as VersionConf
-from .BaseCommand import BaseCommand
+from gibson.command.BaseCommand import BaseCommand
+from gibson.conf.Version import Version as VersionConf
 
 
 class Version(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/WarGames.py

@@ -1,9 +1,8 @@
 import hashlib
 import sys
 
-from core.Conversation import Conversation
-
-from .BaseCommand import BaseCommand
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.Conversation import Conversation
 
 
 class WarGames(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/auth/Auth.py

@@ -1,8 +1,8 @@
 import sys
 
-from ..BaseCommand import BaseCommand
-from .Login import Login
-from .Logout import Logout
+from gibson.command.auth.Login import Login
+from gibson.command.auth.Logout import Logout
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Auth(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/auth/Login.py

@@ -1,20 +1,19 @@
-from api.Cli import Cli
-
-from ..BaseCommand import BaseCommand
+from gibson.api.Cli import Cli
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Login(BaseCommand):
     def execute(self):
         cli = Cli(self.configuration)
-        token = cli.login()
+        access_token, refresh_token = cli.login()
 
-        if token is None:
+        if access_token is None or refresh_token is None:
             self.conversation.newline()
             self.conversation.type(
                 "Login failed, please try again with `gibson auth login`."
             )
         else:
-            self.configuration.set_access_token(token)
+            self.configuration.set_auth_tokens(access_token, refresh_token)
             self.conversation.type(f"Welcome! You are now logged in.")
 
         self.conversation.newline()

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/auth/Logout.py

@@ -1,4 +1,4 @@
-from ..BaseCommand import BaseCommand
+from gibson.command.BaseCommand import BaseCommand
 
 
 class Logout(BaseCommand):

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/tests/test_command_BaseCommand.py

@@ -1,5 +1,5 @@
-from command.BaseCommand import BaseCommand
-from core.Configuration import Configuration
+from gibson.command.BaseCommand import BaseCommand
+from gibson.core.Configuration import Configuration
 
 
 def test_customization_management():

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/command/tests/test_command_Conf.py

@@ -1,5 +1,5 @@
-from command.Conf import Conf
-from core.Configuration import Configuration
+from gibson.command.Conf import Conf
+from gibson.core.Configuration import Configuration
 
 
 def test_get_configuration_keys():

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/conf/Dev.py

@@ -1,9 +1,9 @@
 import os
 
-from conf.dev.Api import Api
-from conf.dev.Base import Base
-from conf.dev.Model import Model
-from conf.dev.Schema import Schema
+from gibson.conf.dev.Api import Api
+from gibson.conf.dev.Base import Base
+from gibson.conf.dev.Model import Model
+from gibson.conf.dev.Schema import Schema
 
 
 class Dev:

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/conf/tests/test_conf_Dependencies.py

@@ -1,4 +1,4 @@
-from conf.Dependencies import Dependencies
+from gibson.conf.Dependencies import Dependencies
 
 
 def test_compute():

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/conf/tests/test_conf_Platform.py

@@ -1,6 +1,6 @@
 import platform
 
-from conf.Platform import Platform
+from gibson.conf.Platform import Platform
 
 
 def test_system():

{gibson_cli-0.1.2 → gibson_cli-0.1.3/gibson}/core/CommandRouter.py

@@ -1,39 +1,39 @@
 import sys
 
-from command.Api import Api
-from command.auth.Auth import Auth
-from command.Base import Base
-from command.Build import Build
-from command.Code import Code
-from command.Conf import Conf
-from command.Count import Count
-from command.Dev import Dev
-from command.Forget import Forget
-from command.Import import Import
-from command.List import List
-from command.Merge import Merge
-from command.Model import Model
-from command.Models import Models
-from command.Modify import Modify
-from command.Module import Module
-from command.New import New
-from command.OpenApi import OpenApi
-from command.Question import Question
-from command.Remove import Remove
-from command.Rename import Rename
-from command.Rewrite import Rewrite
-from command.Schema import Schema
-from command.Schemas import Schemas
-from command.Show import Show
-from command.Test import Test
-from command.Tests import Tests
-from command.Tree import Tree
-from command.Version import Version
-from command.WarGames import WarGames
-from .Configuration import Configuration
-from .Conversation import Conversation
-from .Env import Env
-from .Memory import Memory
+from gibson.command.Api import Api
+from gibson.command.auth.Auth import Auth
+from gibson.command.Base import Base
+from gibson.command.Build import Build
+from gibson.command.Code import Code
+from gibson.command.Conf import Conf
+from gibson.command.Count import Count
+from gibson.command.Dev import Dev
+from gibson.command.Forget import Forget
+from gibson.command.Import import Import
+from gibson.command.List import List
+from gibson.command.Merge import Merge
+from gibson.command.Model import Model
+from gibson.command.Models import Models
+from gibson.command.Modify import Modify
+from gibson.command.Module import Module
+from gibson.command.New import New
+from gibson.command.OpenApi import OpenApi
+from gibson.command.Question import Question
+from gibson.command.Remove import Remove
+from gibson.command.Rename import Rename
+from gibson.command.Rewrite import Rewrite
+from gibson.command.Schema import Schema
+from gibson.command.Schemas import Schemas
+from gibson.command.Show import Show
+from gibson.command.Test import Test
+from gibson.command.Tests import Tests
+from gibson.command.Tree import Tree
+from gibson.command.Version import Version
+from gibson.command.WarGames import WarGames
+from gibson.core.Configuration import Configuration
+from gibson.core.Conversation import Conversation
+from gibson.core.Env import Env
+from gibson.core.Memory import Memory
 
 
 class CommandRouter:

gibson_cli-0.1.3/gibson/core/Completions.py

@@ -0,0 +1,35 @@
+import os
+
+
+class Completions:
+    def __init__(self):
+        self.user_home = os.environ.get("HOME")
+        self.gibson_config = ".gibsonai"
+
+    def install(self):
+        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)
+
+        return self
+
+    def write(self):
+        try:
+            file = os.path.dirname(__file__) + f"/../data/bash-completion.tmpl"
+            with open(file, "r") as f:
+                contents = f.read()
+        except FileNotFoundError:
+            return self
+
+        completions = f"{self.user_home}/{self.gibson_config}/bash_completion"
+        with open(completions, "w") as f:
+            f.write(contents)
+
+        return self