blue-assistant 4.62.1__tar.gz → 4.78.1__tar.gz

{blue_assistant-4.62.1/blue_assistant.egg-info → blue_assistant-4.78.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.62.1
+Version: 4.78.1
 Summary: 🧠 An AI Assistant.
 Home-page: https://github.com/kamangir/blue-assistant
 Author: Arash Abadpour (Kamangir)
@@ -72,4 +72,4 @@ graph LR
 
 [![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.207.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.62.1`](https://github.com/kamangir/blue-assistant).
+built by 🌀 [`blue_options-4.207.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.78.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/README.md

@@ -28,4 +28,4 @@ graph LR
 
 [![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.207.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.62.1`](https://github.com/kamangir/blue-assistant).
+built by 🌀 [`blue_options-4.207.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.78.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/blue_assistant/README.py

@@ -17,14 +17,17 @@ items = [
 
 
 def build():
-    return README.build(
-        items=items,
-        path=os.path.join(file.path(__file__), ".."),
-        ICON=ICON,
-        NAME=NAME,
-        VERSION=VERSION,
-        REPO_NAME=REPO_NAME,
+    return all(
+        README.build(
+            items=readme.get("items", []),
+            path=os.path.join(file.path(__file__), readme["path"]),
+            ICON=ICON,
+            NAME=NAME,
+            VERSION=VERSION,
+            REPO_NAME=REPO_NAME,
+        )
+        for readme in [
+            {"items": items, "path": ".."},
+            {"path": "docs/blue-amo-01.md"},
+        ]
     )
-
-
-

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/blue_assistant/__init__.py

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

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/blue_assistant/script/actions/functions.py

@@ -25,14 +25,12 @@ def get_action_class(
 def perform_action(
     script: BaseScript,
     node_name: str,
-) -> Tuple[bool, Dict]:
+) -> bool:
     action_name = script.nodes[node_name].get("action", "unknown")
 
     success, action_class = get_action_class(action_name=action_name)
     if not success:
-        return False, {
-            "error": f"{action_name}: action not found.",
-        }
+        return success
 
     logger.info(
         "{}.perform_action: {} == {} on {}".format(
@@ -47,6 +45,4 @@ def perform_action(
         script=script,
     )
 
-    return action_object.perform(
-        node_name=node_name,
-    )
+    return action_object.perform(node_name=node_name)

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/blue_assistant/script/actions/generate_image.py

@@ -12,13 +12,10 @@ class GenerateImageAction(GenericAction):
     def perform(
         self,
         node_name: str,
-    ) -> Tuple[bool, Dict]:
-        success, generic_metadata = super().perform(node_name=node_name)
-        if not success:
-            return success, generic_metadata
+    ) -> bool:
+        if not super().perform(node_name=node_name):
+            return False
 
         logger.info(f"🪄 generating image ...: {node_name}")
-        metadata = {}
 
-        metadata.update(generic_metadata)
-        return True, metadata
+        return True

blue_assistant-4.78.1/blue_assistant/script/actions/generate_text.py

@@ -0,0 +1,93 @@
+from typing import Dict, Tuple, List
+from openai import OpenAI
+import pprint
+
+from blueness import module
+from blue_objects import file
+from openai_commands.env import OPENAI_API_KEY
+
+from blue_assistant import NAME
+from blue_assistant.env import BLUE_ASSISTANT_DEFAULT_MODEL, BLUE_ASSISTANT_MAX_TOKEN
+from blue_assistant.script.actions.generic import GenericAction
+from blue_assistant.logger import logger
+
+NAME = module.name(__file__, NAME)
+
+
+class GenerateTextAction(GenericAction):
+    name = file.name(__file__)
+
+    def perform(
+        self,
+        node_name: str,
+    ) -> bool:
+        if not OPENAI_API_KEY:
+            logger.error("OPENAI_API_KEY is not set.")
+            return False
+
+        if not super().perform(node_name=node_name):
+            return False
+
+        messages: List = []
+        node_context = self.script.get_history(node_name)
+        logger.info("node context: {}".format(" -> ".join(node_context)))
+        for successor in reversed(node_context):
+            messages += [
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": self.script.apply_vars(
+                                self.script.nodes[successor]["prompt"]
+                            ),
+                        }
+                    ],
+                }
+            ]
+
+            if self.script.nodes[successor]["completed"]:
+                messages += [
+                    {
+                        "role": "assistant",
+                        "content": [
+                            {
+                                "type": "text",
+                                "text": self.script.nodes[successor]["output"],
+                            }
+                        ],
+                    }
+                ]
+
+        if self.script.verbose:
+            logger.info(f"messages: {pprint.pformat(messages)}")
+
+        client = OpenAI(api_key=OPENAI_API_KEY)
+
+        try:
+            response = client.chat.completions.create(
+                messages=messages,
+                model=BLUE_ASSISTANT_DEFAULT_MODEL,
+                max_tokens=BLUE_ASSISTANT_MAX_TOKEN,
+            )
+        except Exception as e:
+            logger.error(str(e))
+            return False
+
+        if self.script.verbose:
+            logger.info("response: {}".format(response))
+
+        if not response.choices:
+            logger.error("no choice.")
+            return False
+
+        output = response.choices[0].message.content
+        logger.info(f"🗣️ output: {output}")
+
+        self.script.nodes[node_name]["output"] = output
+
+        var_name = self.script.nodes[node_name].get("output", "")
+        if var_name:
+            self.script.vars[var_name] = output
+
+        return True

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/blue_assistant/script/actions/generic.py

@@ -22,7 +22,7 @@ class GenericAction:
     def perform(
         self,
         node_name: str,
-    ) -> Tuple[bool, Dict]:
+    ) -> bool:
         logger.info(
             "{}.perform({}) on {}.{} ...".format(
                 NAME,
@@ -31,4 +31,4 @@ class GenericAction:
                 node_name,
             ),
         )
-        return True, {}
+        return True

{blue_assistant-4.62.1 → blue_assistant-4.78.1}/blue_assistant/script/repository/generic/classes.py

@@ -25,20 +25,16 @@ class GenericScript(BaseScript):
         if not super().run():
             return False
 
-        metadata: Dict[Dict] = {"nodes": {}}
         success: bool = True
-        while (
-            not all(self.G.nodes[node]["completed"] for node in self.G.nodes)
-            and success
-        ):
-            for node_name in tqdm(self.G.nodes):
-                if self.G.nodes[node_name]["completed"]:
+        while not all(self.nodes[node]["completed"] for node in self.nodes) and success:
+            for node_name in tqdm(self.nodes):
+                if self.nodes[node_name]["completed"]:
                     continue
 
                 pending_dependencies = [
                     node_name_
                     for node_name_ in self.G.successors(node_name)
-                    if not self.G.nodes[node_name_]["completed"]
+                    if not self.nodes[node_name_]["completed"]
                 ]
                 if pending_dependencies:
                     logger.info(
@@ -50,22 +46,19 @@ class GenericScript(BaseScript):
                     )
                     continue
 
-                success, output = perform_action(
+                if not perform_action(
                     script=self,
                     node_name=node_name,
-                )
-                self.G.nodes[node_name]["completed"] = success
-                metadata["nodes"][node_name] = {
-                    "success": success,
-                    "output": output,
-                }
-                if not success:
+                ):
+                    success = False
                     break
 
+                self.nodes[node_name]["completed"] = True
+
         if not post_to_object(
             self.object_name,
             "output",
-            metadata,
+            self.metadata,
         ):
             return False
 

{blue_assistant-4.62.1 → blue_assistant-4.78.1/blue_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.62.1
+Version: 4.78.1
 Summary: 🧠 An AI Assistant.
 Home-page: https://github.com/kamangir/blue-assistant
 Author: Arash Abadpour (Kamangir)
@@ -72,4 +72,4 @@ graph LR
 
 [![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.207.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.62.1`](https://github.com/kamangir/blue-assistant).
+built by 🌀 [`blue_options-4.207.1`](https://github.com/kamangir/awesome-bash-cli), based on 🧠 [`blue_assistant-4.78.1`](https://github.com/kamangir/blue-assistant).

blue_assistant-4.62.1/blue_assistant/script/actions/generate_text.py

@@ -1,66 +0,0 @@
-from typing import Dict, Tuple
-from openai import OpenAI
-
-from blueness import module
-from blue_objects import file
-from openai_commands.env import OPENAI_API_KEY
-
-from blue_assistant import NAME
-from blue_assistant.env import BLUE_ASSISTANT_DEFAULT_MODEL, BLUE_ASSISTANT_MAX_TOKEN
-from blue_assistant.script.actions.generic import GenericAction
-from blue_assistant.logger import logger
-
-NAME = module.name(__file__, NAME)
-
-
-class GenerateTextAction(GenericAction):
-    name = file.name(__file__)
-
-    def perform(
-        self,
-        node_name: str,
-    ) -> Tuple[bool, Dict]:
-        metadata = {}
-
-        if not OPENAI_API_KEY:
-            logger.error("OPENAI_API_KEY is not set.")
-            return False, {}
-
-        success, generic_metadata = super().perform(node_name=node_name)
-        if not success:
-            return success, generic_metadata
-
-        client = OpenAI(api_key=OPENAI_API_KEY)
-
-        try:
-            response = client.chat.completions.create(
-                messages=[
-                    {
-                        "role": "user",
-                        "content": [
-                            {
-                                "type": "text",
-                                "text": self.script.nodes[node_name]["prompt"],
-                            }
-                        ],
-                    }
-                ],
-                model=BLUE_ASSISTANT_DEFAULT_MODEL,
-                max_tokens=BLUE_ASSISTANT_MAX_TOKEN,
-            )
-        except Exception as e:
-            logger.error(str(e))
-            return False, {"error": str(e)}
-
-        if self.script.verbose:
-            logger.info("response: {}".format(response))
-
-        if not response.choices:
-            logger.error("no choice.")
-            return False, {}
-
-        metadata["reply"] = response.choices[0].message.content
-        logger.info("🗣️ reply: {}".format(metadata["reply"]))
-
-        metadata.update(generic_metadata)
-        return True, metadata