Merge pull request #85 from Hashmap-Software-Agency/improve-run-file-intent

Improve run file intent

Author: dotchetter

devtools/update_environment.py

@@ -0,0 +1,55 @@
+# Set the current working dir to parent directory
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+from time import sleep
+
+sys.path.append(Path.cwd().parent.as_posix())
+
+if not Path("setup.py").exists():
+    print("You're not in the right directory. Run this script from the "
+          r"project's root directory, e.g. 'C:\users\your_user\projects\pyttman'.")
+    exit(-1)
+
+LAB_ENV_PATH = Path.cwd() / Path("dev_env")
+BUILD_OUTPUT_PATH = Path.cwd() / "dist"
+
+if __name__ == "__main__":
+    if not (LAB_ENV_PATH / "venv").exists():
+        raise FileNotFoundError("Your dev environment is not set up, or "
+                                "is missing the virtual environment. "
+                                "Run devtools/create_environment.py first.")
+
+    print("Building new Pyttman package...")
+    subprocess.check_call("python devtools/build.py".split())
+    os.chdir(LAB_ENV_PATH.as_posix())
+    subprocess.run("python -m virtualenv venv".split())
+
+    while not Path("venv").exists():
+        sleep(0.01)
+
+    package_file = [
+        i for i in os.listdir(BUILD_OUTPUT_PATH.as_posix()) if i.endswith("tar.gz")
+    ].pop()
+
+    print(f"Installing your new version of Pyttman from local build: '{package_file}'")
+    package_file = (BUILD_OUTPUT_PATH / package_file).as_posix()
+    venv_python = (LAB_ENV_PATH / "venv/scripts/python.exe").as_posix()
+    subprocess.run(f"{venv_python} -m pip install multidict".split())
+    subprocess.run(f"{venv_python} -m pip install --upgrade {package_file}".split())
+
+    clear_sc = "clear" if os.name == "posix" else "cls"
+    os.system(clear_sc)
+    os.system("cls")
+
+    print("\nFinished! Here's how to get started:",
+          f"1. Activate the virtual environment:\n\tcd dev_env\n\tvenv/scripts/activate",
+          f"2. Run the command 'pyttman' to see available commands to the Pyttman CLI",
+          "3. If it's the first time you're running Pyttman, run 'pyttman new app {app_name}' to create a new project."
+          "4. Run 'pyttman dev {app_name}' to start the development server.",
+          "5. If you've made changes to the Pyttman framework which you want to test in your testing project, "
+          "run this script again. Your app will be left untouched, but the Pyttman version is upgraded to "
+          "your current HEAD in the Pyttman repo.",
+          sep="\n")

pyttman/tools/pyttmancli/intents.py

@@ -72,6 +72,9 @@ def respond(self, message: Message) -> Reply | ReplyStream:
             print(f"- Attempt [{i + 1}/{num_retries}]:", end=" ")
             try:
                 terraformer.terraform()
+            except FileExistsError as e:
+                return Reply(str(e))
+
             except requests.exceptions.ConnectionError as e:
                 print("failed.",
                       "Cannot connect to the server, "
@@ -179,26 +182,22 @@ class RunFile(Intent, PyttmanCliComplainerMixin):
 
     def respond(self, message: Message) -> Reply | ReplyStream:
         app_name = message.entities["app_name"]
-        script_file = message.entities["script_file_name"]
-
-        if complaint := self.complain_app_not_found(app_name):
-            return Reply(complaint)
-        if script_file is None:
+        if (script_path := message.entities["script_file_name"]) is None:
             return Reply("Filename must be entered, as a '.py' file. "
                          f"Example: {self.example}")
+        if complaint := self.complain_app_not_found(app_name):
+            return Reply(complaint)
 
-        script_file = Path(script_file)
         app = bootstrap_app(devmode=True, module=app_name)
         app.hooks.trigger(LifeCycleHookType.before_start)
         global_variables = globals().copy()
         global_variables.update(locals())
         shell = code.InteractiveConsole(global_variables)
-        script_path = Path.cwd() / script_file
 
         with open(script_path.as_posix(), "r") as f:
             # Set variable to indicate for the running script that it's main
             source = f.read()
-            code_obj = compile(source, script_file.as_posix(), "exec")
+            code_obj = compile(source, script_path.as_posix(), "exec")
             global_variables["__name__"] = "__main__"
             exec(code_obj, global_variables)
         return Reply(f"Script file executed successfully.")