Fixes issue 221 but fixing remaining CI issues after restructure (#225)

* * remove all references to Bee-Hive, Bee Hive, Hive, bee-hive, bee hive, and hive
* fix tools/check-schemas.sh
* fix all unit tests so that pytest runs green

* rebase

* fix demo tests workflow

* fix CI: demos workflow

* fix CI: demos workflow

* fix CI: demos workflow

* fix CI: demos workflow

* fix CI: demos workflow

.github/workflows/maestro_demotest.yaml → .github/workflows/maestro_demo-test.yaml

@@ -39,7 +39,7 @@ jobs:
       - name: Run CrewAI workflow
         run: |
           cd maestro
-          poetry run demos/demos/activity-planner-crewai.ai/run.py
+          demos/workflows/activity-planner-crewai.ai/run.sh
           # TODO: Add a way to check the output of the demo
         env:
           MAESTRO_DEMO_OLLAMA_MODEL: ollama/llama3.2:3b

.python-version

@@ -0,0 +1 @@
+3.12.8

maestro/cli/commands.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os, yaml, json, jsonschema
+import os, yaml, json, jsonschema, traceback
 
 from openai import OpenAI
-from jsonschema.exceptions import ValidationError
+from jsonschema.exceptions import ValidationError, SchemaError
 
-from common import Console, parse_yaml
 from src.workflow import Workflow
+from cli.common import Console, parse_yaml
 
 # Root CLI class
 class CLI:
@@ -120,6 +120,11 @@ def validate(self):
                     Console.ok("YAML file is valid.")
                 except ValidationError as ve:
                     Console.error("YAML file is NOT valid:\n {error_message}".format(error_message=str(ve.message)))
+                    if self.verbose():
+                        print(traceback.format_exc())
+                    return 1
+                except SchemaError as se:
+                    Console.error("Schema file is NOT valid:\n {error_message}".format(error_message=str(se.message)))
                     return 1
         return 0
 

maestro/demos/README.md

@@ -1,5 +1,5 @@
-# bee-hive-demos
-Demos and use cases of bee hive
+# maestro-demos
+Demos and use cases of Maestro
 
 ## Example environment setup using Podman Desktop, docker-compose, bee-stack, and local Ollama
 ### bee-stack setup

maestro/demos/agents/crewai/activity_planner/README.md

@@ -2,7 +2,7 @@
 
 Simple agent which given a prompt including a city, will suggest things to do in the cold or wet weather
 
-Primarily this is to support a demonstration of how a Crew.AI Crew can be integrated into beehive.  Note that a crew can be composed of multiple agents
+Primarily this is to support a demonstration of how a Crew.AI Crew can be integrated into Maestro.  Note that a crew can be composed of multiple agents
 
 # Requirements
 
@@ -13,7 +13,7 @@ Primarily this is to support a demonstration of how a Crew.AI Crew can be integr
 
 # Running
 
-* Run `bee-hive-demos/agents/crewai/activity_planner.py` via shell command line, or IDE such as vscode
+* Run `demos/agents/crewai/activity_planner.py` via shell command line, or IDE such as vscode
 
 ## Future enhancements
 

maestro/demos/workflows/activity-planner-crewai.ai/README.md

@@ -11,7 +11,7 @@ This is a simple demonstration of a workflow that uses a third party agent - in
 
 # Running
 
-* Run `bee-hive-demos/demos/activity-planner-crewai.ai/run.py` via shell command line, or IDE such as vscode
+* Run `demos/activity-planner-crewai.ai/run.py` via shell command line, or IDE such as vscode
 
 # Caveats
 

maestro/demos/workflows/activity-planner-crewai.ai/agents.yaml

@@ -1,4 +1,4 @@
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Agent
 metadata:
   name: activity_planner.ActivityPlannerCrew.activity_crew

maestro/demos/workflows/activity-planner-crewai.ai/run.sh

@@ -1,2 +1,2 @@
 #! /bin/bash
-# TODO break down the hive shell script into two pieces - commands required to run the demo go here
+# TODO break down the maestro shell script into two pieces - commands required to run the demo go here

maestro/demos/workflows/activity-planner-crewai.ai/setup.sh

@@ -1,2 +1 @@
 #! /bin/bash
-# TODO break down the hive shell script into two pieces - commands required to set up the demo go here

maestro/demos/workflows/activity-planner-crewai.ai/workflow.yaml

@@ -1,7 +1,7 @@
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Workflow
 metadata:
-  name: beehive-deployment
+  name: maestro-deployment
   labels:
     app: activity-planner-demo
 spec:

maestro/demos/workflows/activity-planner.ai/README.md

@@ -2,15 +2,15 @@ TODO the demo does not currently function out of the box as the workflow schema
 
 # Activity-Planner example
 
-A multi-agent workflow using Bee-Hive to check if the current temperature in a location is hotter or colder than average and recommend activities to do based on the weather.
+A multi-agent workflow using Maestro to check if the current temperature in a location is hotter or colder than average and recommend activities to do based on the weather.
 
 ## Getting Started
 
 * Run a local instance of the [bee-stack](https://github.com/i-am-bee/bee-stack/blob/main/README.md)
 
 * Verify a valid llm is available to bee-stack
 
-* Install [bee-hive](https://github.com/i-am-bee/bee-hive) dependencies: `cd ../../../bee-hive/bee-hive && poetry shell && poetry install && cd -`
+* Install [maestro](https://github.com/i-am-bee/beeai-labs) dependencies: `cd ../../../maestro && poetry shell && poetry install && cd -`
 
 * Configure environmental variables: `cp example.env .env`
 

maestro/demos/workflows/activity-planner.ai/agents.yaml

@@ -1,4 +1,4 @@
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Agent
 metadata:
   name: current-affairs
@@ -12,7 +12,7 @@ spec:
     - weather
   instructions: An input is given of a location. Use the OpenMeteo tool to get today's current forecast for the location. Return results in the format - location, temperature in Fahrenheit, and date.
 ---
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Agent
 metadata:
   name: hot-or-not
@@ -26,7 +26,7 @@ spec:
     - weather
   instructions:  Use the OpenMeteo weather tool to find the historical temperature of the given location. Determine if the input temperature is warmer or colder than the historical temperature.  Respond with "hotter" or "colder" and include the location name.
 ---
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Agent
 metadata:
   name: cold-activities
@@ -40,7 +40,7 @@ spec:
     - web_search
   instructions:  The input a location that is currently colder than normal.  Perform a web search to find fun activities to do in the colder near the location and recommend five.
 ---
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Agent
 metadata:
   name: hot-activities

maestro/demos/workflows/activity-planner.ai/setup.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 cp example.env .env
 cp .env ./../common/src
-cd ../../../bee-hive
+cd ../../../maestro
 poetry env activate
 poetry install
 cd -

maestro/demos/workflows/activity-planner.ai/src/run.py

@@ -2,7 +2,7 @@
 
 import sys
 import yaml
-from bee_hive import Workflow
+from src.workflow import Workflow
 import dotenv
 
 dotenv.load_dotenv()

maestro/demos/workflows/activity-planner.ai/workflow.yaml

@@ -1,7 +1,7 @@
-apiVersion: beehive/v1alpha1
+apiVersion: maestro/v1alpha1
 kind: Workflow
 metadata:
-  name: beehive-deployment
+  name: maestro-deployment
   labels:
     app: mas-example
 spec:
@@ -21,13 +21,13 @@ spec:
     steps:
       - name: current-affairs
         agent: current-affairs
-        condition:
-        - default:
-          do: hot-or-not
+        condition: 
+        - case: (input.find('hotter') != -1)
+          do: hot-activities
+        - default: cold-activities
       - name: hot-or-not
         agent: hot-or-not
         condition:
         - if: (input.find('hotter') != -1)
           do: hot-activities
-          else: cold-activities
-      - name: end
+          else: cold-activities