gibson-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{gibson_cli-0.3.0/gibson_cli.egg-info → gibson_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/
@@ -67,7 +67,7 @@ Let's consider a more concrete example. You imported your datastore into the CLI
 
 So Gibson creates a new version of the user table containing a nickname column. This new table is stored in last memory.  If you execute:
 
-`gibson models`
+`gibson rewrite models`
 
 The CLI will write the code for what is sitting in last memory.
 
@@ -123,8 +123,8 @@ All of Gibson's configuration files and caches are stored in `$HOME/.gibson`. Us
   - `:command! -nargs=* Gibson r ! gibson <args>`
 - Open a file and execute commands:
   - `:Gibson module abc`
-  - `:Gibson models`
-  - `:Gibson schemas`
+  - `:Gibson rewrite models`
+  - `:Gibson rewrite schemas`
 
 ## Currently Supported Software
 
@@ -200,7 +200,7 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 
 ### Writing the Base Code
 
-`gibson base`
+`gibson rewrite base`
 
 ### Writing the Code for a Single Model
 
@@ -212,20 +212,20 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 
 ### Writing the Code for All Models
 
-`gibson models`
+`gibson rewrite models`
 
 ### Writing the Code for All Schemas
 
-`gibson schemas`
+`gibson rewrite schemas`
 
 ### Adding a New Module to the Software Using AI
 
 - gibson module [module name]
   - e.g. gibson module user
 - Gibson will display the SQL tables it has generated as a result of your request. It will store these entities in its last memory.
-- gibson models
+- `gibson rewrite models`
 - This will write the code for the entities it just created.
-- gibson merge
+- `gibson merge`
 - This will merge the new entities into your project.
 - Note, at the moment Gibson does not build the tables into your datastore.
 
@@ -234,7 +234,7 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 - `gibson modify [table name] [natural language request]`
   - e.g. `gibson modify my_table I want to add a new column called name and remove all of the columns related to email`
 - Gibson will display the modified SQL table and store it in its last memory.
-- `gibson models`
+- `gibson rewrite models`
 - This will write the code for the modified entity.
 - `gibson merge`
 - This will merge the modified entity into your project.

{gibson_cli-0.3.0 → gibson_cli-0.3.2}/README.md

@@ -50,7 +50,7 @@ Let's consider a more concrete example. You imported your datastore into the CLI
 
 So Gibson creates a new version of the user table containing a nickname column. This new table is stored in last memory.  If you execute:
 
-`gibson models`
+`gibson rewrite models`
 
 The CLI will write the code for what is sitting in last memory.
 
@@ -106,8 +106,8 @@ All of Gibson's configuration files and caches are stored in `$HOME/.gibson`. Us
   - `:command! -nargs=* Gibson r ! gibson <args>`
 - Open a file and execute commands:
   - `:Gibson module abc`
-  - `:Gibson models`
-  - `:Gibson schemas`
+  - `:Gibson rewrite models`
+  - `:Gibson rewrite schemas`
 
 ## Currently Supported Software
 
@@ -183,7 +183,7 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 
 ### Writing the Base Code
 
-`gibson base`
+`gibson rewrite base`
 
 ### Writing the Code for a Single Model
 
@@ -195,20 +195,20 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 
 ### Writing the Code for All Models
 
-`gibson models`
+`gibson rewrite models`
 
 ### Writing the Code for All Schemas
 
-`gibson schemas`
+`gibson rewrite schemas`
 
 ### Adding a New Module to the Software Using AI
 
 - gibson module [module name]
   - e.g. gibson module user
 - Gibson will display the SQL tables it has generated as a result of your request. It will store these entities in its last memory.
-- gibson models
+- `gibson rewrite models`
 - This will write the code for the entities it just created.
-- gibson merge
+- `gibson merge`
 - This will merge the new entities into your project.
 - Note, at the moment Gibson does not build the tables into your datastore.
 
@@ -217,7 +217,7 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 - `gibson modify [table name] [natural language request]`
   - e.g. `gibson modify my_table I want to add a new column called name and remove all of the columns related to email`
 - Gibson will display the modified SQL table and store it in its last memory.
-- `gibson models`
+- `gibson rewrite models`
 - This will write the code for the modified entity.
 - `gibson merge`
 - This will merge the modified entity into your project.

gibson_cli-0.3.2/gibson/command/Version.py

@@ -0,0 +1,32 @@
+import requests
+
+from gibson.command.BaseCommand import BaseCommand
+from gibson.conf.Version import Version as VersionConf
+from gibson.core.Colors import Color, colorize, command, option, subcommand
+
+
+class Version(BaseCommand):
+    def execute(self):
+        try:
+            r = requests.get("https://pypi.org/pypi/gibson-cli/json")
+            latest_version = r.json()["info"]["version"]
+        except:
+            latest_version = VersionConf.num
+
+        if latest_version != VersionConf.num:
+            self.conversation.type(
+                f"A new version of {command(self.configuration.command)} is available: {colorize(latest_version, Color.CYAN)}\n"
+            )
+            self.conversation.type(
+                f"You are currently using version: {colorize(VersionConf.num, Color.VIOLET)}\n"
+            )
+            self.conversation.type(
+                f"Please update to the latest version by running: {command('pip3')} {subcommand('install')} {option('--upgrade')} gibson-cli\n"
+            )
+        else:
+            self.conversation.type(
+                f"Nice! You are using the latest version of {command(self.configuration.command)}: {colorize(VersionConf.num, Color.CYAN)}\n"
+            )
+
+        self.conversation.newline()
+        return True

{gibson_cli-0.3.0 → gibson_cli-0.3.2}/gibson/core/Colors.py

@@ -60,5 +60,9 @@ def arguments(list):
     return f"[{'|'.join(map(lambda x: argument(x), list))}]"
 
 
+def option(text):
+    return colorize(text, Color.CYAN)
+
+
 def hint(text):
     return colorize(text, Color.GREY)

{gibson_cli-0.3.0 → gibson_cli-0.3.2}/gibson/core/Configuration.py

@@ -407,11 +407,8 @@ class Configuration:
             pass
 
         with open(f"{self.paths.auth}/{self.API_ENV}", "w") as f:
-            f.write(
-                json.dumps(
-                    {"access_token": access_token, "refresh_token": refresh_token}
-                )
-            )
+            data = {"access_token": access_token, "refresh_token": refresh_token}
+            json.dump(data, f, indent=2)
 
     def set_config_paths(self, ignore_env_vars=False):
         user_home = os.environ.get("HOME")
@@ -464,7 +461,7 @@ class Configuration:
             pass
 
         with open(self.project.paths.config, "w") as f:
-            f.write(json.dumps(self.settings))
+            json.dump(self.settings, f, indent=2)
 
         self.read_config()
 

{gibson_cli-0.3.0 → gibson_cli-0.3.2}/gibson/core/Memory.py

@@ -104,7 +104,7 @@ class Memory:
 
     def __remember(self, file, data):
         with open(file, "w") as f:
-            f.write(json.dumps(data))
+            json.dump(data, f, indent=2)
 
         return self
 
@@ -123,7 +123,7 @@ class Memory:
         return self.get_path_top() + "/last"
 
     def get_path_top(self):
-        return (
+        return os.path.expandvars(
             self.configuration.project.paths.memory
             + "/"
             + self.configuration.project.name

{gibson_cli-0.3.0 → gibson_cli-0.3.2}/gibson/services/auth/Server.py

@@ -1,9 +1,8 @@
-import webbrowser
 import time
-from http.server import HTTPServer, BaseHTTPRequestHandler
+import webbrowser
+from http.server import BaseHTTPRequestHandler, HTTPServer
 from threading import Thread
-from socket import socket
-from urllib.parse import urlparse, parse_qs
+from urllib.parse import parse_qs, urlparse
 
 
 # HTTP handler for processing the token sent from the web browser
@@ -38,11 +37,8 @@ class Server(HTTPServer):
     thread = None
 
     def __init__(self, app_domain: str):
-        sock = socket()
-        sock.bind(("", 0))
-        self.port = sock.getsockname()[1]
-        super().__init__(("localhost", self.port), Handler)
-
+        super().__init__(("localhost", 0), Handler)
+        self.port = self.server_address[1]
         self.app_domain = app_domain
 
     def get_tokens(self):

{gibson_cli-0.3.0 → gibson_cli-0.3.2/gibson_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/
@@ -67,7 +67,7 @@ Let's consider a more concrete example. You imported your datastore into the CLI
 
 So Gibson creates a new version of the user table containing a nickname column. This new table is stored in last memory.  If you execute:
 
-`gibson models`
+`gibson rewrite models`
 
 The CLI will write the code for what is sitting in last memory.
 
@@ -123,8 +123,8 @@ All of Gibson's configuration files and caches are stored in `$HOME/.gibson`. Us
   - `:command! -nargs=* Gibson r ! gibson <args>`
 - Open a file and execute commands:
   - `:Gibson module abc`
-  - `:Gibson models`
-  - `:Gibson schemas`
+  - `:Gibson rewrite models`
+  - `:Gibson rewrite schemas`
 
 ## Currently Supported Software
 
@@ -200,7 +200,7 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 
 ### Writing the Base Code
 
-`gibson base`
+`gibson rewrite base`
 
 ### Writing the Code for a Single Model
 
@@ -212,20 +212,20 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 
 ### Writing the Code for All Models
 
-`gibson models`
+`gibson rewrite models`
 
 ### Writing the Code for All Schemas
 
-`gibson schemas`
+`gibson rewrite schemas`
 
 ### Adding a New Module to the Software Using AI
 
 - gibson module [module name]
   - e.g. gibson module user
 - Gibson will display the SQL tables it has generated as a result of your request. It will store these entities in its last memory.
-- gibson models
+- `gibson rewrite models`
 - This will write the code for the entities it just created.
-- gibson merge
+- `gibson merge`
 - This will merge the new entities into your project.
 - Note, at the moment Gibson does not build the tables into your datastore.
 
@@ -234,7 +234,7 @@ For example, you might provide class name = `MyBaseModel` and import path = `pro
 - `gibson modify [table name] [natural language request]`
   - e.g. `gibson modify my_table I want to add a new column called name and remove all of the columns related to email`
 - Gibson will display the modified SQL table and store it in its last memory.
-- `gibson models`
+- `gibson rewrite models`
 - This will write the code for the modified entity.
 - `gibson merge`
 - This will merge the modified entity into your project.

{gibson_cli-0.3.0 → gibson_cli-0.3.2}/pyproject.toml

@@ -14,7 +14,7 @@ classifiers = [
   "Intended Audience :: Developers",
   "Programming Language :: Python :: 3.9",
 ]
-version = "0.3.0"
+version = "0.3.2"
 
 [tool.setuptools.packages.find]
 where = ["."]

gibson_cli-0.3.0/gibson/command/Version.py

@@ -1,9 +0,0 @@
-from gibson.command.BaseCommand import BaseCommand
-from gibson.conf.Version import Version as VersionConf
-
-
-class Version(BaseCommand):
-    def execute(self):
-        self.conversation.type(f"{VersionConf.num}\n")
-        self.conversation.newline()
-        return True