blue-assistant 4.62.1__py3-none-any.whl → 4.66.1__py3-none-any.whl

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/__init__.py

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

blue_assistant/script/__main__.py

@@ -28,7 +28,7 @@ parser.add_argument(
 parser.add_argument(
     "--verbose",
     type=int,
-    default=0,
+    default=1,
     help="0 | 1",
 )
 parser.add_argument(

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/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/script/actions/generate_text.py

@@ -1,5 +1,6 @@
-from typing import Dict, Tuple
+from typing import Dict, Tuple, List
 from openai import OpenAI
+import pprint
 
 from blueness import module
 from blue_objects import file
@@ -19,48 +20,74 @@ class GenerateTextAction(GenericAction):
     def perform(
         self,
         node_name: str,
-    ) -> Tuple[bool, Dict]:
-        metadata = {}
-
+    ) -> bool:
         if not OPENAI_API_KEY:
             logger.error("OPENAI_API_KEY is not set.")
-            return False, {}
+            return False
 
-        success, generic_metadata = super().perform(node_name=node_name)
-        if not success:
-            return success, generic_metadata
+        if not super().perform(node_name=node_name):
+            return False
 
-        client = OpenAI(api_key=OPENAI_API_KEY)
+        messages: List = []
+        node_history = self.script.get_history(node_name)
+        logger.info("node history: {}".format(node_history))
+        for successor in reversed(node_history):
+            messages += [
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": self.script.apply_vars(
+                                self.script.nodes[successor]["prompt"]
+                            ),
+                        }
+                    ],
+                }
+            ]
 
-        try:
-            response = client.chat.completions.create(
-                messages=[
+            if self.script.G.nodes[successor]["completed"]:
+                messages += [
                     {
-                        "role": "user",
+                        "role": "assistant",
                         "content": [
                             {
                                 "type": "text",
-                                "text": self.script.nodes[node_name]["prompt"],
+                                "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, {"error": str(e)}
+            return False
 
         if self.script.verbose:
             logger.info("response: {}".format(response))
 
         if not response.choices:
             logger.error("no choice.")
-            return False, {}
+            return False
+
+        output = response.choices[0].message.content
+        logger.info(f"🗣️ output: {output}")
+
+        self.script.G.nodes[node_name]["output"] = output
 
-        metadata["reply"] = response.choices[0].message.content
-        logger.info("🗣️ reply: {}".format(metadata["reply"]))
+        var_name = self.script.nodes[node_name].get("output", "")
+        if var_name:
+            self.script.vars[var_name] = output
 
-        metadata.update(generic_metadata)
-        return True, metadata
+        return True

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/script/repository/generic/classes.py

@@ -50,18 +50,15 @@ 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.G.nodes[node_name]["completed"] = True
+
         if not post_to_object(
             self.object_name,
             "output",

{blue_assistant-4.62.1.dist-info → blue_assistant-4.66.1.dist-info}/METADATA

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

{blue_assistant-4.62.1.dist-info → blue_assistant-4.66.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-blue_assistant/README.py,sha256=q6EWCy7zojQESGDF-2xEoXS1Bl0wRJTe2jw_1QM_WYw,600
-blue_assistant/__init__.py,sha256=raQKlM2ZVTRayybALjBn2GVLRPH_vj0B49nDQRFJZls,310
+blue_assistant/README.py,sha256=Nzr3v-VSa8CISkqkLHd8ILyY_WiJ7x2igYPH-lYpzEY,795
+blue_assistant/__init__.py,sha256=0v_LdK6vN-oGFPitqPD_ntVE3VlcyYyrddqz4xbjDnM,310
 blue_assistant/__main__.py,sha256=URtal70XZc0--3FDTYWcLtnGOqBYjMX9gt-L1k8hDXI,361
 blue_assistant/config.env,sha256=JV9zx17FflIPmV1hK-yuM0GlrUjkGuaQ_EzPFPTkoXM,66
 blue_assistant/env.py,sha256=rgIlKVsALrRD1sYJV3SkFfzIvWNavix2HN0sSy2cCi4,391
@@ -26,23 +26,23 @@ blue_assistant/help/__main__.py,sha256=cVejR7OpoWPg0qLbm-PZf5TuJS27x49jzfiyCLyzE
 blue_assistant/help/functions.py,sha256=9WsmXGMN-R7sqlkGLK0nY90Peg8Gah4rIu75QbLhImo,689
 blue_assistant/help/script.py,sha256=wvS_5FWu9LAsaDDq7UoxXEadRwGseYqwu2P-9dNc5Bo,1077
 blue_assistant/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-blue_assistant/script/__main__.py,sha256=immGrRfasPHdPDxZJweu0coi_V0jg8_2zfqTnRxNfaU,1529
+blue_assistant/script/__main__.py,sha256=D5APoSVe-l5H0Nrgyq5do4cSbmRyYmflq1x_Dd5d1fM,1529
 blue_assistant/script/load.py,sha256=Bd5L9HBL0Yh1MLGAyGrQX3XQLH-UiOWLsHJvzCmNs3g,773
 blue_assistant/script/actions/__init__.py,sha256=8Sp6avoJGDXVORvx5mvkxTNaxjz_KevKN4Wb8qLZHsQ,487
-blue_assistant/script/actions/functions.py,sha256=DcgNzDvGM2rz4DJE6kNSblPZ-qePdVwPOUdV8uKdcjw,1330
-blue_assistant/script/actions/generate_image.py,sha256=wRfWU_xA26rhl7BAXDS_XLPFhxLLl2q1tVuqx5QSGIE,628
-blue_assistant/script/actions/generate_text.py,sha256=6JtNikwl1ESgIuv6Kfzyonn0FImyI0O0Te6uJEVNmtg,1986
-blue_assistant/script/actions/generic.py,sha256=3sHSzPgrOnYGLebUa1ToUBJCD-GCiN5xVwCqjqaLChQ,748
+blue_assistant/script/actions/functions.py,sha256=0fiihOWbFiwZEXV6t9oxJaxJ5E5X-k3weqGTOKTu3sA,1233
+blue_assistant/script/actions/generate_image.py,sha256=bGDdP9XfBtFFFNL4d7DA7_FJvsFKadPOgwVAXkFgyjE,477
+blue_assistant/script/actions/generate_text.py,sha256=rKDjY_keN_E_vdboQ_SqG2APyUanpAKRDVGCxzghO3k,2817
+blue_assistant/script/actions/generic.py,sha256=dIjqocIEpLEb1BI76kHivVpDUG5QpeZHLA2onsYn1SU,731
 blue_assistant/script/actions/wip.py,sha256=K4kJE4bn3u6o-QWTESPydO_eD54zOwZbU9WLAO94z1Q,171
 blue_assistant/script/repository/__init__.py,sha256=WFkbe-6yyljpmeVpXgLhOPt-YRc7BwkRNzPO-7Wz0Dg,573
 blue_assistant/script/repository/blue_amo/__init__.py,sha256=WjL9GIlN-DBnbUMJ8O_FxTp0rcVGlsIS3H9YtXEefTk,76
 blue_assistant/script/repository/blue_amo/classes.py,sha256=RY1gjZVPX8xu7nfeiZoTL8RTpu73RsoaNv4ZoGv9NNs,234
 blue_assistant/script/repository/generic/__init__.py,sha256=kLffGsQMQAFJTw6IZBE5eBxvshP1x9wwHHR4hsDJblo,75
-blue_assistant/script/repository/generic/classes.py,sha256=goE6n1VUtp-FJGJxZ2fmeakFPKowPKK07dzndI2Ay0k,2117
+blue_assistant/script/repository/generic/classes.py,sha256=X6h-cWFleUQF9flyq6ClYSdi5ysGOTsy156w8jT1wvY,1964
 blue_assistant/script/repository/moon_datasets/__init__.py,sha256=aCtmP2avh3yKAJ668S3GsLR9vbBOm5zt9FSFCqy_tAs,86
 blue_assistant/script/repository/moon_datasets/classes.py,sha256=68zThDhjF9gGRnsw8EKNLGOMBFbCSljt0jGovuOzCAc,197
-blue_assistant-4.62.1.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
-blue_assistant-4.62.1.dist-info/METADATA,sha256=nB-ghPlc86Ahf4c1--qJ3OK5OzBKxu3EJ4pEODBfzOE,2625
-blue_assistant-4.62.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-blue_assistant-4.62.1.dist-info/top_level.txt,sha256=ud0BkBbdOVze13bNqHuhZj1rwCztaBtDf5ChEYzASOs,15
-blue_assistant-4.62.1.dist-info/RECORD,,
+blue_assistant-4.66.1.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
+blue_assistant-4.66.1.dist-info/METADATA,sha256=o9HM9_F9s8xZ0lhJhtngCE2qqdbASHaRGOMzhuFw4XE,2625
+blue_assistant-4.66.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+blue_assistant-4.66.1.dist-info/top_level.txt,sha256=ud0BkBbdOVze13bNqHuhZj1rwCztaBtDf5ChEYzASOs,15
+blue_assistant-4.66.1.dist-info/RECORD,,