blue-assistant 4.137.1__tar.gz → 4.142.1__tar.gz

{blue_assistant-4.137.1/blue_assistant.egg-info → blue_assistant-4.142.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.137.1
+Version: 4.142.1
 Summary: 🧠 An AI Assistant.
 Home-page: https://github.com/kamangir/blue-assistant
 Author: Arash Abadpour (Kamangir)
@@ -76,4 +76,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.137.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.142.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/README.md

@@ -32,4 +32,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.137.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.142.1`](https://github.com/kamangir/blue-assistant).

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/blue_assistant/__init__.py

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

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/blue_assistant/config.env

@@ -1,5 +1,5 @@
 BLUE_ASSISTANT_TEXT_DEFAULT_MODEL=gpt-4o
-BLUE_ASSISTANT_TEXT_MAX_TOKEN=2000
+BLUE_ASSISTANT_TEXT_MAX_TOKENS=2000
 
 BLUE_ASSISTANT_IMAGE_DEFAULT_MODEL=dall-e-3
 BLUE_ASSISTANT_IMAGE_DEFAULT_QUALITY=standard

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/blue_assistant/env.py

@@ -10,11 +10,11 @@ BLUE_ASSISTANT_TEXT_DEFAULT_MODEL = os.getenv(
     "",
 )
 
-BLUE_ASSISTANT_TEXT_MAX_TOKEN_str = os.getenv("BLUE_ASSISTANT_TEXT_MAX_TOKEN", "")
+BLUE_ASSISTANT_TEXT_MAX_TOKENS_str = os.getenv("BLUE_ASSISTANT_TEXT_MAX_TOKENS", "")
 try:
-    BLUE_ASSISTANT_TEXT_MAX_TOKEN = int(BLUE_ASSISTANT_TEXT_MAX_TOKEN_str)
+    BLUE_ASSISTANT_TEXT_MAX_TOKENS = int(BLUE_ASSISTANT_TEXT_MAX_TOKENS_str)
 except Exception:
-    BLUE_ASSISTANT_TEXT_MAX_TOKEN = 2000
+    BLUE_ASSISTANT_TEXT_MAX_TOKENS = 2000
 
 
 BLUE_ASSISTANT_IMAGE_DEFAULT_MODEL = os.getenv(

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/blue_assistant/script/actions/generate_image.py

@@ -1,6 +1,5 @@
 from blueness import module
-from blue_objects import objects
-from openai_commands.image_generation.api import OpenAIImageGenerator
+from openai_commands.image_generation import api
 
 from blue_assistant import NAME
 from blue_assistant.env import (
@@ -21,20 +20,13 @@ def generate_image(
 ) -> bool:
     logger.info(f"{NAME}: {script} @ {node_name} ...")
 
-    generator = OpenAIImageGenerator(
-        model=BLUE_ASSISTANT_IMAGE_DEFAULT_MODEL,
-        verbose=script.verbose,
-    )
-
     filename = f"{node_name}.png"
 
-    success = generator.generate(
+    success, _ = api.generate_image(
         prompt=script.nodes[node_name]["prompt"],
-        filename=objects.path_of(
-            filename=filename,
-            object_name=script.object_name,
-            create=True,
-        ),
+        filename=filename,
+        object_name=script.object_name,
+        model=BLUE_ASSISTANT_IMAGE_DEFAULT_MODEL,
         quality=(BLUE_ASSISTANT_IMAGE_DEFAULT_QUALITY if script.test_mode else "hd"),
         size=(BLUE_ASSISTANT_IMAGE_DEFAULT_SIZE if script.test_mode else "1792x1024"),
         sign_with_prompt=False,
@@ -44,7 +36,8 @@ def generate_image(
                 script.nodes[node_name]["prompt"],
             )
         ],
-    )[0]
+        verbose=script.verbose,
+    )
 
     if success:
         script.nodes[node_name]["filename"] = filename

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/blue_assistant/script/actions/generate_text.py

@@ -1,15 +1,13 @@
 from typing import List
-from openai import OpenAI
-import pprint
 
 from blueness import module
-from openai_commands.env import OPENAI_API_KEY
+from openai_commands.text_generation import api
 
 from blue_assistant import NAME
 from blue_assistant.script.repository.base.classes import BaseScript
 from blue_assistant.env import (
     BLUE_ASSISTANT_TEXT_DEFAULT_MODEL,
-    BLUE_ASSISTANT_TEXT_MAX_TOKEN,
+    BLUE_ASSISTANT_TEXT_MAX_TOKENS,
 )
 from blue_assistant.logger import logger
 
@@ -21,14 +19,10 @@ def generate_text(
     script: BaseScript,
     node_name: str,
 ) -> bool:
-    if not OPENAI_API_KEY:
-        logger.error("OPENAI_API_KEY is not set.")
-        return False
-
     logger.info(f"{NAME}: {script} @ {node_name} ...")
 
     messages: List = []
-    list_of_context_nodes = script.get_history(node_name)
+    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 += [
@@ -56,29 +50,15 @@ def generate_text(
                 }
             ]
 
-    if 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_TEXT_DEFAULT_MODEL,
-            max_tokens=BLUE_ASSISTANT_TEXT_MAX_TOKEN,
-        )
-    except Exception as e:
-        logger.error(str(e))
-        return False
-
-    if script.verbose:
-        logger.info("response: {}".format(response))
-
-    if not response.choices:
-        logger.error("no choice.")
-        return False
+    success, output, _ = api.generate_text(
+        messages=messages,
+        model=BLUE_ASSISTANT_TEXT_DEFAULT_MODEL,
+        max_tokens=BLUE_ASSISTANT_TEXT_MAX_TOKENS,
+        verbose=script.verbose,
+    )
+    if not success:
+        return success
 
-    output = response.choices[0].message.content
     logger.info(f"🗣️ output: {output}")
     script.nodes[node_name]["output"] = output
 

{blue_assistant-4.137.1 → blue_assistant-4.142.1}/blue_assistant/script/repository/base/classes.py

@@ -81,13 +81,13 @@ class BaseScript:
 
         return self.save_graph()
 
-    def get_history(
+    def get_context(
         self,
         node_name: str,
     ) -> List[str]:
         return reduce(
             lambda x, y: x + y,
-            [self.get_history(successor) for successor in self.G.successors(node_name)],
+            [self.get_context(successor) for successor in self.G.successors(node_name)],
             [node_name],
         )
 

{blue_assistant-4.137.1 → blue_assistant-4.142.1/blue_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: blue_assistant
-Version: 4.137.1
+Version: 4.142.1
 Summary: 🧠 An AI Assistant.
 Home-page: https://github.com/kamangir/blue-assistant
 Author: Arash Abadpour (Kamangir)
@@ -76,4 +76,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.137.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.142.1`](https://github.com/kamangir/blue-assistant).