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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.297.1
+Version: 4.319.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.297.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.319.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.297.1 → blue_assistant-4.319.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.297.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.319.1`](https://github.com/kamangir/blue-assistant).

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

@@ -7,7 +7,7 @@ function blue_assistant_script_run() {
     local do_upload=$(abcli_option_int "$options" upload $(abcli_not $do_dryrun))
 
     local script_options=$2
-    local script_name=$(abcli_option "$script_options" script generic)
+    local script_name=$(abcli_option "$script_options" script base)
 
     local object_name=$(abcli_clarify_object $3 $script_name-$(abcli_string_timestamp_short))
     [[ "$do_download" == 1 ]] &&

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/.abcli/tests/script_run.sh

@@ -18,9 +18,9 @@ function test_blue_assistant_script_run() {
             ~upload,$options \
             script=$script_name \
             $object_name \
-            "${@:2}" \
             --test_mode 1 \
-            --verbose 1
+            --verbose 1 \
+            "${@:2}"
 
         [[ $? -ne 0 ]] && return 1
 

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

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

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

@@ -37,6 +37,7 @@ def help_run(
     args = [
         "[--test_mode 1]",
         "[--verbose 1]",
+        "[--runnable <~node_1,~node_2>]",
     ]
 
     return show_usage(

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

@@ -48,6 +48,13 @@ parser.add_argument(
     default=1,
     help="0 | 1",
 )
+parser.add_argument(
+    "--runnable",
+    type=str,
+    default="",
+    help="~node_1,~node_2",
+)
+
 args = parser.parse_args()
 
 delim = " " if args.delim == "space" else args.delim
@@ -70,7 +77,9 @@ elif args.task == "run":
     )
 
     if success:
-        success = script.run()
+        success = script.run(
+            runnable=args.runnable,
+        )
 else:
     success = None
 

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/actions/__init__.py

@@ -1,13 +1,13 @@
 from typing import Dict, Callable
 
-from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.script.repository.base.root import RootScript
 from blue_assistant.script.actions.generic import generic_action
 from blue_assistant.script.actions.generate_image import generate_image
 from blue_assistant.script.actions.generate_text import generate_text
 from blue_assistant.script.actions.web_crawl import web_crawl
 
 
-dict_of_actions: Dict[str, Callable[[BaseScript, str], bool]] = {
+dict_of_actions: Dict[str, Callable[[RootScript, str], bool]] = {
     "generic": generic_action,
     "generate_image": generate_image,
     "generate_text": generate_text,

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/actions/generate_image.py

@@ -7,7 +7,7 @@ from blue_assistant.env import (
     BLUE_ASSISTANT_IMAGE_DEFAULT_SIZE,
     BLUE_ASSISTANT_IMAGE_DEFAULT_QUALITY,
 )
-from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.script.repository.base.root import RootScript
 from blue_assistant.logger import logger
 
 NAME = module.name(__file__, NAME)
@@ -15,15 +15,15 @@ NAME = module.name(__file__, NAME)
 
 # https://platform.openai.com/docs/guides/images
 def generate_image(
-    script: BaseScript,
+    script: RootScript,
     node_name: str,
 ) -> bool:
-    logger.info(f"{NAME}: {script} @ {node_name} ...")
+    logger.info(f"{NAME}: @ {node_name} ...")
 
     filename = f"{node_name}.png"
 
     success, _ = api.generate_image(
-        prompt=script.nodes[node_name]["prompt"],
+        prompt=script.apply_vars(script.nodes[node_name]["prompt"]),
         filename=filename,
         object_name=script.object_name,
         model=BLUE_ASSISTANT_IMAGE_DEFAULT_MODEL,

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/actions/generate_text.py

@@ -4,7 +4,7 @@ from blueness import module
 from openai_commands.text_generation import api
 
 from blue_assistant import NAME
-from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.script.repository.base.root import RootScript
 from blue_assistant.env import (
     BLUE_ASSISTANT_TEXT_DEFAULT_MODEL,
     BLUE_ASSISTANT_TEXT_MAX_TOKENS,
@@ -16,13 +16,17 @@ NAME = module.name(__file__, NAME)
 
 # https://platform.openai.com/docs/guides/text-generation
 def generate_text(
-    script: BaseScript,
+    script: RootScript,
     node_name: str,
 ) -> bool:
-    logger.info(f"{NAME}: {script} @ {node_name} ...")
+    logger.info(f"{NAME}: @ {node_name} ...")
+
+    list_of_context_nodes = [node_name]
+    if script.nodes[node_name].get("use_context", False):
+        logger.info("📜 using context.")
+        list_of_context_nodes = script.get_context(node_name)
 
     messages: List = []
-    list_of_context_nodes = script.get_context(node_name)
     logger.info("node context: {}".format(" <- ".join(list_of_context_nodes)))
     for context_node in reversed(list_of_context_nodes):
         messages += [

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/actions/generic.py

@@ -1,15 +1,15 @@
 from blueness import module
 
 from blue_assistant import NAME
-from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.script.repository.base.root import RootScript
 from blue_assistant.logger import logger
 
 NAME = module.name(__file__, NAME)
 
 
 def generic_action(
-    script: BaseScript,
+    script: RootScript,
     node_name: str,
 ) -> bool:
-    logger.info(f"{NAME}: {script} @ {node_name} ...")
+    logger.info(f"{NAME}: @ {node_name} ...")
     return True

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/actions/web_crawl.py

@@ -4,7 +4,8 @@ from blue_options.logger import log_list
 
 from blue_assistant import NAME
 from blue_assistant.web.crawl import crawl_list_of_urls
-from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.web.functions import normalize_url
+from blue_assistant.script.repository.base.root import RootScript
 from blue_assistant.logger import logger
 
 
@@ -12,10 +13,10 @@ NAME = module.name(__file__, NAME)
 
 
 def web_crawl(
-    script: BaseScript,
+    script: RootScript,
     node_name: str,
 ) -> bool:
-    logger.info(f"{NAME}: {script} @ {node_name} ...")
+    logger.info(f"{NAME}: @ {node_name} ...")
 
     seed_url_var_name = script.nodes[node_name].get("seed_urls", "")
     if not isinstance(seed_url_var_name, str):
@@ -32,16 +33,16 @@ def web_crawl(
     if seed_url_var_name not in script.vars:
         logger.error(f"{node_name}: {seed_url_var_name}: seed_urls not found in vars.")
         return False
-    seed_urls = script.vars[seed_url_var_name]
+    seed_urls = list({normalize_url(url) for url in script.vars[seed_url_var_name]})
     log_list(logger, "using", seed_urls, "seed url(s)")
 
-    success, _ = crawl_list_of_urls(
+    success, crawl_cache = crawl_list_of_urls(
         seed_urls=seed_urls,
         object_name=script.object_name,
         max_iterations=script.nodes[node_name]["max_iterations"],
         cache_prefix=node_name,
     )
 
-    script.nodes[node_name]["output"] = success
+    script.nodes[node_name]["output"] = crawl_cache
 
     return success

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/repository/__init__.py

@@ -1,14 +1,15 @@
 from typing import List, Type
 
-from blue_assistant.script.repository.generic.classes import GenericScript
+from blue_assistant.script.repository.base.root import RootScript
+from blue_assistant.script.repository.base.classes import BaseScript
 from blue_assistant.script.repository.blue_amo.classes import BlueAmoScript
 from blue_assistant.script.repository.hue.classes import HueScript
 from blue_assistant.script.repository.orbital_data_explorer.classes import (
     OrbitalDataExplorerScript,
 )
 
-list_of_script_classes: List[Type[GenericScript]] = [
-    GenericScript,
+list_of_script_classes: List[Type[RootScript]] = [
+    BaseScript,
     BlueAmoScript,
     HueScript,
     OrbitalDataExplorerScript,

blue_assistant-4.319.1/blue_assistant/script/repository/base/classes.py

@@ -0,0 +1,21 @@
+import copy
+
+from blueness import module
+from blue_objects import file, path
+
+from blue_assistant import NAME
+from blue_assistant.script.repository.base.root import RootScript
+from blue_assistant.script.actions import dict_of_actions
+from blue_assistant.logger import logger
+
+
+NAME = module.name(__file__, NAME)
+
+
+class BaseScript(RootScript):
+    name = path.name(file.path(__file__))
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        self.dict_of_actions = copy.deepcopy(dict_of_actions)

blue_assistant-4.297.1/blue_assistant/script/repository/base/classes.py → blue_assistant-4.319.1/blue_assistant/script/repository/base/root.py

@@ -1,22 +1,19 @@
-from typing import Dict, List
 import os
-import networkx as nx
+from typing import Dict, List
 from functools import reduce
+import networkx as nx
+from tqdm import tqdm
 
-from blueness import module
-from blue_objects import file, objects
+from blue_options.options import Options
+from blue_objects import file, path, objects
 from blue_objects.metadata import post_to_object
 from blueflow.workflow import dot_file
 
-from blue_assistant import NAME
 from blue_assistant.logger import logger
 
 
-NAME = module.name(__file__, NAME)
-
-
-class BaseScript:
-    name = "base"
+class RootScript:
+    name = path.name(file.path(__file__))
 
     def __init__(
         self,
@@ -24,12 +21,16 @@ class BaseScript:
         test_mode: bool = False,
         verbose: bool = False,
     ):
+        self.nodes_changed = False
+
         self.object_name = object_name
 
         self.test_mode = test_mode
 
         self.verbose = verbose
 
+        self.dict_of_actions = {}
+
         metadata_filename = os.path.join(
             file.path(__file__),
             f"../{self.name}",
@@ -66,12 +67,12 @@ class BaseScript:
         if self.test_mode:
             logger.info("🧪  test mode is on.")
 
-            for node_name, node in self.nodes.items():
-                if "test_mode" in self.script:
-                    updates = self.script["test_mode"]
-                    logger.info(f"🧪  vars.update({updates})")
-                    self.vars.update(updates)
+            if "test_mode" in self.script:
+                updates = self.script["test_mode"]
+                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})")
@@ -85,9 +86,9 @@ class BaseScript:
         )
 
         logger.info(
-            "loaded {} var(s){}".format(
+            "loaded {} var(s): {}".format(
                 len(self.vars),
-                "" if verbose else ": {}".format(", ".join(self.vars.keys())),
+                ", ".join(self.vars.keys()),
             )
         )
         if verbose:
@@ -108,9 +109,17 @@ class BaseScript:
         for var_name, var_value in self.vars.items():
             text = text.replace(f":::{var_name}", str(var_value))
 
+        for node_name, node in self.nodes.items():
+            node_output = node.get("output", "")
+            if isinstance(node_output, str):
+                text = text.replace(f":::{node_name}", node_output)
+
         return text
 
-    def generate_graph(self) -> bool:
+    def generate_graph(
+        self,
+        verbose: bool = False,
+    ) -> bool:
         self.G: nx.DiGraph = nx.DiGraph()
 
         list_of_nodes = list(self.nodes.keys())
@@ -118,12 +127,13 @@ class BaseScript:
             list_of_nodes += node.get("depends-on", "").split(",")
 
         list_of_nodes = list({node_name for node_name in list_of_nodes if node_name})
-        logger.info(
-            "{} node(s): {}".format(
-                len(list_of_nodes),
-                ", ".join(list_of_nodes),
+        if verbose:
+            logger.info(
+                "{} node(s): {}".format(
+                    len(list_of_nodes),
+                    ", ".join(list_of_nodes),
+                )
             )
-        )
 
         for node_name in list_of_nodes:
             self.G.add_node(node_name)
@@ -145,23 +155,96 @@ class BaseScript:
             [node_name],
         )
 
-    def run(
+    def perform_action(
         self,
+        node_name: str,
     ) -> bool:
-        logger.info(
-            "{}.run: {}:{} -> {}".format(
-                NAME,
-                self.__class__.__name__,
-                self.name,
-                self.object_name,
+        action_name = self.nodes[node_name].get("action", "unknown")
+        logger.info(f"---- node: {node_name} ---- ")
+
+        if action_name in self.dict_of_actions:
+            return self.dict_of_actions[action_name](
+                script=self,
+                node_name=node_name,
             )
-        )
 
-        return post_to_object(
+        logger.error(f"{action_name}: action not found.")
+        return False
+
+    def run(
+        self,
+        runnable: str = "",
+    ) -> bool:
+        logger.info(f"{self.name}.run -> {self.object_name}")
+
+        if runnable:
+            logger.info(f"applying runnables: {runnable}")
+            runnable_options = Options(runnable)
+            for node_name, node_is_runnable in runnable_options.items():
+                logger.info(f"{node_name}.runnable={node_is_runnable}")
+                self.nodes[node_name]["runnable"] = node_is_runnable
+
+        success: bool = True
+        while (
+            not all(self.nodes[node].get("completed", False) for node in self.nodes)
+            and success
+        ):
+            self.nodes_changed = False
+
+            for node_name in tqdm(self.nodes):
+                if self.nodes[node_name].get("completed", False):
+                    continue
+
+                if not self.nodes[node_name].get("runnable", True):
+                    logger.info(f"Not runnable, skipped: {node_name}.")
+                    self.nodes[node_name]["completed"] = True
+                    continue
+
+                pending_dependencies = [
+                    node_name_
+                    for node_name_ in self.G.successors(node_name)
+                    if not self.nodes[node_name_].get("completed", False)
+                ]
+                if pending_dependencies:
+                    logger.info(
+                        'node "{}": {} pending dependenci(es): {}'.format(
+                            node_name,
+                            len(pending_dependencies),
+                            ", ".join(pending_dependencies),
+                        )
+                    )
+                    continue
+
+                if not self.perform_action(node_name=node_name):
+                    success = False
+                    break
+
+                self.nodes[node_name]["completed"] = True
+
+                cache_filename = self.nodes[node_name].get("cache", "")
+                if cache_filename:
+                    if not file.save_text(
+                        objects.path_of(
+                            object_name=self.object_name,
+                            filename=cache_filename,
+                        ),
+                        [self.nodes[node_name].get("output", "")],
+                    ):
+                        success = False
+                        break
+
+                if self.nodes_changed:
+                    logger.info("🪄  nodes changed.")
+                    break
+
+        if not post_to_object(
             self.object_name,
-            "script",
-            self.script,
-        )
+            "output",
+            self.metadata,
+        ):
+            success = False
+
+        return success
 
     def save_graph(self) -> bool:
         return dot_file.save_to_file(

{blue_assistant-4.297.1 → blue_assistant-4.319.1}/blue_assistant/script/repository/blue_amo/actions/__init__.py

@@ -2,12 +2,12 @@ from typing import Dict, Callable
 
 from blue_assistant.script.repository.base.classes import BaseScript
 from blue_assistant.script.repository.blue_amo.actions import (
-    slicing_into_frames,
+    setting_frame_prompts,
     stitching_the_frames,
 )
 
 
 dict_of_actions: Dict[str, Callable[[BaseScript, str], bool]] = {
-    "slicing_into_frames": slicing_into_frames.slicing_into_frames,
+    "setting_frame_prompts": setting_frame_prompts.setting_frame_prompts,
     "stitching_the_frames": stitching_the_frames.stitching_the_frames,
 }

blue_assistant-4.297.1/blue_assistant/script/repository/blue_amo/actions/slicing_into_frames.py → blue_assistant-4.319.1/blue_assistant/script/repository/blue_amo/actions/setting_frame_prompts.py

@@ -7,13 +7,13 @@ from blue_assistant.logger import logger
 NAME = module.name(__file__, NAME)
 
 
-def slicing_into_frames(
+def setting_frame_prompts(
     script: BaseScript,
     node_name: str,
 ) -> bool:
-    logger.info(f"{NAME}: processing the output...")
+    logger.info(NAME)
 
-    list_of_frame_prompts = script.nodes[node_name]["output"].split("---")
+    list_of_frame_prompts = script.nodes["slicing_into_frames"]["output"].split("---")
     if len(list_of_frame_prompts) != script.vars["frame_count"]:
         logger.warning(
             "{} != {}, frame count doesn't match, bad AI! 😁".format(
@@ -31,8 +31,8 @@ def slicing_into_frames(
 
         script.nodes[node_name]["prompt"] = (
             script.nodes[node_name]["prompt"]
-            .replace(":::story", " ".join(list_of_frame_prompts[:index]))
-            .replace(":::input", list_of_frame_prompts[index])
+            .replace(":::story_so_far", " ".join(list_of_frame_prompts[:index]))
+            .replace(":::story_of_this_frame", list_of_frame_prompts[index])
         )
 
     return True

blue_assistant-4.319.1/blue_assistant/script/repository/blue_amo/classes.py

@@ -0,0 +1,58 @@
+import copy
+
+from blueness import module
+from blue_objects import file, path
+
+from blue_assistant import NAME
+from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.script.repository.blue_amo.actions import dict_of_actions
+from blue_assistant.logger import logger
+
+NAME = module.name(__file__, NAME)
+
+
+class BlueAmoScript(BaseScript):
+    name = path.name(file.path(__file__))
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        self.dict_of_actions.update(dict_of_actions)
+
+    def generate_graph(
+        self,
+        verbose: bool = False,
+    ) -> bool:
+        if not super().generate_graph(verbose=verbose):
+            return False
+
+        map_node_name = "generating_the_frames"
+        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]
+        self.G.remove_node(map_node_name)
+
+        reduce_node_name = "stitching_the_frames"
+        for index in range(self.vars["frame_count"]):
+            node_name = f"generating_frame_{index+1:03d}"
+
+            self.nodes[node_name] = copy.deepcopy(map_node)
+
+            self.G.add_node(node_name)
+            self.G.add_edge(
+                node_name,
+                "setting_frame_prompts",
+            )
+            self.G.add_edge(
+                reduce_node_name,
+                node_name,
+            )
+
+        return self.save_graph()

blue_assistant-4.319.1/blue_assistant/script/repository/hue/classes.py

@@ -0,0 +1,7 @@
+from blue_objects import file, path
+
+from blue_assistant.script.repository.base.classes import BaseScript
+
+
+class HueScript(BaseScript):
+    name = path.name(file.path(__file__))

blue_assistant-4.319.1/blue_assistant/script/repository/orbital_data_explorer/actions/__init__.py

@@ -0,0 +1,11 @@
+from typing import Dict, Callable
+
+from blue_assistant.script.repository.base.classes import BaseScript
+from blue_assistant.script.repository.orbital_data_explorer.actions import (
+    expanding_the_extractions,
+)
+
+
+dict_of_actions: Dict[str, Callable[[BaseScript, str], bool]] = {
+    "expanding_the_extractions": expanding_the_extractions.expanding_the_extractions,
+}