blue-assistant 4.319.1__tar.gz → 4.329.1__tar.gz

{blue_assistant-4.319.1/blue_assistant.egg-info → blue_assistant-4.329.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.319.1
+Version: 4.329.1
 Summary: 🧠 An AI Assistant.
 Home-page: https://github.com/kamangir/blue-assistant
 Author: Arash Abadpour (Kamangir)
@@ -124,4 +124,4 @@ Also home to [`@web`](https://raw.githubusercontent.com/kamangir/blue-assistant/
 
 [![pylint](https://github.com/kamangir/blue-assistant/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/blue-assistant/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/blue-assistant/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/blue-assistant.svg)](https://pypi.org/project/blue-assistant/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/blue-assistant)](https://pypistats.org/packages/blue-assistant)
 
-built by 🌀 [`blue_options-4.240.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.319.1`](https://github.com/kamangir/blue-assistant).
+built by 🌀 [`blue_options-4.240.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.329.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/README.md

@@ -79,4 +79,4 @@ Also home to [`@web`](./blue_assistant/web/)
 
 [![pylint](https://github.com/kamangir/blue-assistant/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/blue-assistant/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/blue-assistant/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/blue-assistant.svg)](https://pypi.org/project/blue-assistant/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/blue-assistant)](https://pypistats.org/packages/blue-assistant)
 
-built by 🌀 [`blue_options-4.240.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.319.1`](https://github.com/kamangir/blue-assistant).
+built by 🌀 [`blue_options-4.240.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.329.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/.abcli/script/run.sh

@@ -8,8 +8,9 @@ function blue_assistant_script_run() {
 
     local script_options=$2
     local script_name=$(abcli_option "$script_options" script base)
+    local script_version=$(abcli_option "$script_options" version base)
 
-    local object_name=$(abcli_clarify_object $3 $script_name-$(abcli_string_timestamp_short))
+    local object_name=$(abcli_clarify_object $3 $script_name-$script_version-$(abcli_string_timestamp_short))
     [[ "$do_download" == 1 ]] &&
         abcli_download - $object_name
 
@@ -19,6 +20,7 @@ function blue_assistant_script_run() {
         python3 -m blue_assistant.script \
         run \
         --script_name $script_name \
+        --script_version $script_version \
         --object_name $object_name \
         "${@:4}"
     [[ $? -ne 0 ]] && return 1

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/__init__.py

@@ -4,7 +4,7 @@ ICON = "🧠"
 
 DESCRIPTION = f"{ICON} An AI Assistant."
 
-VERSION = "4.319.1"
+VERSION = "4.329.1"
 
 REPO_NAME = "blue-assistant"
 

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/help/script.py

@@ -1,8 +1,10 @@
 from typing import List
+from functools import reduce
 
 from blue_options.terminal import show_usage, xtra
 
 from blue_assistant.script.repository import list_of_script_names
+from blue_assistant.script.repository.functions import get_script_versions
 
 
 def help_list(
@@ -32,7 +34,7 @@ def help_run(
 ) -> str:
     options = xtra("~download,dryrun,~upload", mono=mono)
 
-    script_options = "script=<script>"
+    script_options = "script=<name>,version=<version>"
 
     args = [
         "[--test_mode 1]",
@@ -40,6 +42,20 @@ def help_run(
         "[--runnable <~node_1,~node_2>]",
     ]
 
+    def script_version_details(script_name: str) -> List[str]:
+        list_of_script_versions = get_script_versions(script_name)
+
+        return (
+            [
+                "{}: {}".format(
+                    script_name,
+                    " | ".join(list_of_script_versions),
+                )
+            ]
+            if list_of_script_versions
+            else []
+        )
+
     return show_usage(
         [
             "@assistant",
@@ -50,9 +66,16 @@ def help_run(
             "[-|<object-name>]",
         ]
         + args,
-        "run <object-name>.",
+        "run <script-name>/<script-version> in <object-name>.",
         {
-            "script: {}".format(" | ".join(list_of_script_names)): [],
+            "name: {}".format(" | ".join(list_of_script_names)): reduce(
+                lambda x, y: x + y,
+                [
+                    script_version_details(script_name)
+                    for script_name in list_of_script_names
+                ],
+                [],
+            )
         },
         mono=mono,
     )

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/script/__main__.py

@@ -21,6 +21,11 @@ parser.add_argument(
     type=str,
     help=" | ".join(list_of_script_names),
 )
+parser.add_argument(
+    "--script_version",
+    type=str,
+    default="base",
+)
 parser.add_argument(
     "--object_name",
     type=str,
@@ -71,6 +76,7 @@ if args.task == "list":
 elif args.task == "run":
     success, script = load_script(
         script_name=args.script_name,
+        script_version=args.script_version,
         object_name=args.object_name,
         test_mode=args.test_mode == 1,
         verbose=args.verbose == 1,

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/script/load.py

@@ -8,8 +8,11 @@ from blue_assistant.logger import logger
 def load_script(
     script_name: str,
     object_name: str,
+    script_version: str = "base",
     test_mode: bool = False,
+    log: bool = True,
     verbose: bool = False,
+    save_graph: bool = True,
 ) -> Tuple[bool, BaseScript]:
     found: bool = False
     script_class: Type[BaseScript] = BaseScript
@@ -22,8 +25,13 @@ def load_script(
     if not found:
         logger.error(f"{script_name}: script not found.")
 
-    return found, script_class(
+    script = script_class(
+        script_version=script_version,
         object_name=object_name,
         test_mode=test_mode,
+        log=log,
         verbose=verbose,
+        save_graph=save_graph,
     )
+
+    return found and script.valid, script

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/script/repository/base/root.py

@@ -6,7 +6,7 @@ from tqdm import tqdm
 
 from blue_options.options import Options
 from blue_objects import file, path, objects
-from blue_objects.metadata import post_to_object
+from blue_objects.metadata import post_to_object, get_from_object
 from blueflow.workflow import dot_file
 
 from blue_assistant.logger import logger
@@ -18,9 +18,14 @@ class RootScript:
     def __init__(
         self,
         object_name: str,
+        script_version: str = "base",
         test_mode: bool = False,
+        log: bool = True,
         verbose: bool = False,
+        save_graph: bool = True,
     ):
+        self.valid = False
+
         self.nodes_changed = False
 
         self.object_name = object_name
@@ -38,64 +43,133 @@ class RootScript:
         )
         self.metadata: Dict
         success, self.metadata = file.load_yaml(metadata_filename)
-        assert success, f"cannot load {self.name}/metadata.yaml"
+        if not success:
+            logger.error(f"cannot load {self.name}/metadata.yaml")
+            return
+
+        # validate and set
+        last_script_version = get_from_object(
+            object_name,
+            "script_version",
+            script_version,
+        )
+        if script_version != last_script_version:
+            logger.error(
+                "script version in {} is {} != {}".format(
+                    object_name,
+                    last_script_version,
+                    script_version,
+                )
+            )
+            return
+        if not post_to_object(
+            object_name,
+            "script_version",
+            script_version,
+        ):
+            return
+        if log:
+            logger.info(f"script version: {script_version}")
 
         self.metadata.setdefault("script", {})
-        assert isinstance(
-            self.script,
-            dict,
-        ), "script: expected dict, received {}.".format(
-            self.script.__class__.__name__,
-        )
+        if not isinstance(self.script, dict):
+            logger.error(
+                "script: expected dict, received {}.".format(
+                    self.script.__class__.__name__,
+                )
+            )
+            return
 
         self.script.setdefault("nodes", {})
-        assert isinstance(
+        if not isinstance(
             self.nodes,
             dict,
-        ), "nodes: expected dict, received {}.".format(
-            self.nodes.__class__.__name__,
-        )
+        ):
+            logger.error(
+                "nodes: expected dict, received {}.".format(
+                    self.nodes.__class__.__name__,
+                )
+            )
+            return
 
         self.script.setdefault("vars", {})
-        assert isinstance(
+        if not isinstance(
             self.vars,
             dict,
-        ), "vars: expected dict, received {}.".format(
-            self.vars.__class__.__name__,
-        )
+        ):
+            logger.error(
+                "vars: expected dict, received {}.".format(
+                    self.vars.__class__.__name__,
+                )
+            )
+            return
+
+        self.script.setdefault("versions", {})
+        if not isinstance(
+            self.versions,
+            dict,
+        ):
+            logger.error(
+                "versions: expected dict, received {}.".format(
+                    self.versions.__class__.__name__,
+                )
+            )
+            return
+
+        if script_version != "base":
+            if script_version not in self.versions:
+                logger.error(f"{script_version}: script version not found.")
+                return
+
+            for thing in ["vars", "nodes"]:
+                updates = self.versions[script_version].get(thing, {})
+                if len(updates) and log:
+                    logger.info(f"{thing}.update({updates})")
+                self.metadata["script"][thing].update(updates)
 
         if self.test_mode:
-            logger.info("🧪  test mode is on.")
+            if log:
+                logger.info("🧪  test mode is on.")
 
             if "test_mode" in self.script:
                 updates = self.script["test_mode"]
-                logger.info(f"🧪  vars.update({updates})")
+                if log:
+                    logger.info(f"🧪  vars.update({updates})")
                 self.vars.update(updates)
 
             for node_name, node in self.nodes.items():
                 if "test_mode" in node:
                     updates = node["test_mode"]
-                    logger.info(f"🧪  {node_name}.update({updates})")
+                    if log:
+                        logger.info(f"🧪  {node_name}.update({updates})")
                     node.update(updates)
 
-        logger.info(
-            "loaded {} node(s): {}".format(
-                len(self.nodes),
-                ", ".join(self.nodes.keys()),
+        if log:
+            logger.info(
+                "loaded {} node(s): {}".format(
+                    len(self.nodes),
+                    ", ".join(self.nodes.keys()),
+                )
             )
-        )
 
-        logger.info(
-            "loaded {} var(s): {}".format(
-                len(self.vars),
-                ", ".join(self.vars.keys()),
+            logger.info(
+                "loaded {} var(s): {}".format(
+                    len(self.vars),
+                    ", ".join(self.vars.keys()),
+                )
             )
-        )
         if verbose:
             for var_name, var_value in self.vars.items():
                 logger.info("{}: {}".format(var_name, var_value))
 
-        assert self.generate_graph(), "cannot generate graph."
+        if not self.generate_graph(
+            log=log,
+            verbose=verbose,
+            save_graph=save_graph,
+        ):
+            return
+
+        self.valid = True
 
     def __str__(self) -> str:
         return "{}[{} var(s), {} node(s) -> {}]".format(
@@ -118,7 +192,9 @@ class RootScript:
 
     def generate_graph(
         self,
+        log: bool = True,
         verbose: bool = False,
+        save_graph: bool = True,
     ) -> bool:
         self.G: nx.DiGraph = nx.DiGraph()
 
@@ -143,7 +219,7 @@ class RootScript:
                 if dependency:
                     self.G.add_edge(node_name, dependency)
 
-        return self.save_graph()
+        return self.save_graph(log=log) if save_graph else True
 
     def get_context(
         self,
@@ -246,7 +322,10 @@ class RootScript:
 
         return success
 
-    def save_graph(self) -> bool:
+    def save_graph(
+        self,
+        log: bool = True,
+    ) -> bool:
         return dot_file.save_to_file(
             objects.path_of(
                 filename="workflow.dot",
@@ -260,6 +339,7 @@ class RootScript:
                 ]
             ),
             add_legend=False,
+            log=log,
         )
 
     # Aliases
@@ -274,3 +354,7 @@ class RootScript:
     @property
     def vars(self) -> Dict:
         return self.metadata["script"]["vars"]
+
+    @property
+    def versions(self) -> Dict:
+        return self.metadata["script"]["versions"]

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant/script/repository/blue_amo/classes.py

@@ -21,19 +21,26 @@ class BlueAmoScript(BaseScript):
 
     def generate_graph(
         self,
+        log: bool = True,
         verbose: bool = False,
+        save_graph: bool = True,
     ) -> bool:
-        if not super().generate_graph(verbose=verbose):
+        if not super().generate_graph(
+            log=log,
+            verbose=verbose,
+            save_graph=save_graph,
+        ):
             return False
 
         map_node_name = "generating_the_frames"
-        logger.info(
-            "{}: expanding {} X {}...".format(
-                NAME,
-                map_node_name,
-                self.vars["frame_count"],
+        if log:
+            logger.info(
+                "{}: expanding {} X {}...".format(
+                    NAME,
+                    map_node_name,
+                    self.vars["frame_count"],
+                )
             )
-        )
 
         map_node = self.nodes[map_node_name]
         del self.nodes[map_node_name]
@@ -55,4 +62,4 @@ class BlueAmoScript(BaseScript):
                 node_name,
             )
 
-        return self.save_graph()
+        return self.save_graph(log=log) if save_graph else True

blue_assistant-4.329.1/blue_assistant/script/repository/functions.py

@@ -0,0 +1,18 @@
+from typing import List, Tuple
+
+from blue_options import string
+
+from blue_assistant.script.load import load_script
+
+
+def get_script_versions(
+    script_name: str,
+) -> List[str]:
+    success, script = load_script(
+        script_name=script_name,
+        object_name=string.timestamp(),
+        log=False,
+        save_graph=False,
+    )
+
+    return list(script.versions.keys()) if success else []

{blue_assistant-4.319.1 → blue_assistant-4.329.1/blue_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.319.1
+Version: 4.329.1
 Summary: 🧠 An AI Assistant.
 Home-page: https://github.com/kamangir/blue-assistant
 Author: Arash Abadpour (Kamangir)
@@ -124,4 +124,4 @@ Also home to [`@web`](https://raw.githubusercontent.com/kamangir/blue-assistant/
 
 [![pylint](https://github.com/kamangir/blue-assistant/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/blue-assistant/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/blue-assistant/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/blue-assistant/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/blue-assistant.svg)](https://pypi.org/project/blue-assistant/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/blue-assistant)](https://pypistats.org/packages/blue-assistant)
 
-built by 🌀 [`blue_options-4.240.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.319.1`](https://github.com/kamangir/blue-assistant).
+built by 🌀 [`blue_options-4.240.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.329.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.319.1 → blue_assistant-4.329.1}/blue_assistant.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ blue_assistant/script/actions/generate_text.py
 blue_assistant/script/actions/generic.py
 blue_assistant/script/actions/web_crawl.py
 blue_assistant/script/repository/__init__.py
+blue_assistant/script/repository/functions.py
 blue_assistant/script/repository/base/__init__.py
 blue_assistant/script/repository/base/classes.py
 blue_assistant/script/repository/base/root.py