From 155368be3be2bec09ccf30684cce5c7babaf1699 Mon Sep 17 00:00:00 2001 From: Greyson LaLonde Date: Wed, 10 Jan 2024 09:39:36 -0500 Subject: [PATCH] Move to src dir usage (#99) --- poetry.lock | 6 +++--- pyproject.toml | 4 ++++ {crewai => src/crewai}/__init__.py | 0 {crewai => src/crewai}/agent.py | 0 {crewai => src/crewai}/agents/__init__.py | 0 {crewai => src/crewai}/agents/cache/__init__.py | 0 .../crewai}/agents/cache/cache_handler.py | 0 {crewai => src/crewai}/agents/cache/cache_hit.py | 0 {crewai => src/crewai}/agents/exceptions.py | 0 {crewai => src/crewai}/agents/executor.py | 0 {crewai => src/crewai}/agents/output_parser.py | 0 {crewai => src/crewai}/agents/tools_handler.py | 0 {crewai => src/crewai}/crew.py | 0 {crewai => src/crewai}/process.py | 0 {crewai => src/crewai}/prompts.py | 13 ++++++++++--- {crewai => src/crewai}/prompts/en.json | 0 {crewai => src/crewai}/task.py | 0 {crewai/tools => src/crewai/tasks}/__init__.py | 0 {crewai => src/crewai}/tasks/task_output.py | 0 src/crewai/tools/__init__.py | 0 {crewai => src/crewai}/tools/agent_tools.py | 0 {crewai => src/crewai}/tools/cache_tools.py | 0 22 files changed, 17 insertions(+), 6 deletions(-) rename {crewai => src/crewai}/__init__.py (100%) rename {crewai => src/crewai}/agent.py (100%) rename {crewai => src/crewai}/agents/__init__.py (100%) rename {crewai => src/crewai}/agents/cache/__init__.py (100%) rename {crewai => src/crewai}/agents/cache/cache_handler.py (100%) rename {crewai => src/crewai}/agents/cache/cache_hit.py (100%) rename {crewai => src/crewai}/agents/exceptions.py (100%) rename {crewai => src/crewai}/agents/executor.py (100%) rename {crewai => src/crewai}/agents/output_parser.py (100%) rename {crewai => src/crewai}/agents/tools_handler.py (100%) rename {crewai => src/crewai}/crew.py (100%) rename {crewai => src/crewai}/process.py (100%) rename {crewai => src/crewai}/prompts.py (83%) rename {crewai => src/crewai}/prompts/en.json (100%) rename {crewai => src/crewai}/task.py (100%) rename {crewai/tools => src/crewai/tasks}/__init__.py (100%) rename {crewai => src/crewai}/tasks/task_output.py (100%) create mode 100644 src/crewai/tools/__init__.py rename {crewai => src/crewai}/tools/agent_tools.py (100%) rename {crewai => src/crewai}/tools/cache_tools.py (100%) diff --git a/poetry.lock b/poetry.lock index 6aba5d769..8a3af52f3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -870,13 +870,13 @@ extended-testing = ["aiosqlite (>=0.19.0,<0.20.0)", "aleph-alpha-client (>=2.15. [[package]] name = "langchain-core" -version = "0.1.8" +version = "0.1.9" description = "Building applications with LLMs through composability" optional = false python-versions = ">=3.8.1,<4.0" files = [ - {file = "langchain_core-0.1.8-py3-none-any.whl", hash = "sha256:f4d1837d6d814ed36528b642211933d1f0bd84e1eff361f4630a8c750acc27d0"}, - {file = "langchain_core-0.1.8.tar.gz", hash = "sha256:93ab72f5ab202526310fad389a45626501fd76ecf56d451111c0d4abe8183407"}, + {file = "langchain_core-0.1.9-py3-none-any.whl", hash = "sha256:1dd45aec185ce3afb1c19fb2e88cdbc19fafa7ae929d8107799a7c82ef69ea9f"}, + {file = "langchain_core-0.1.9.tar.gz", hash = "sha256:4b51fdbdbc06027c26ea89a6da809cae2e404c9daa95dc6c10e3eae383d8ea6a"}, ] [package.dependencies] diff --git a/pyproject.toml b/pyproject.toml index 5d539862e..a4ec4afd5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,6 +5,10 @@ version = "0.1.24" description = "Cutting-edge framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks." authors = ["Joao Moura "] readme = "README.md" +packages = [ + { include = "crewai", from = "src" }, +] + [tool.poetry.urls] Homepage = "https://github.com/joaomdmoura/crewai" diff --git a/crewai/__init__.py b/src/crewai/__init__.py similarity index 100% rename from crewai/__init__.py rename to src/crewai/__init__.py diff --git a/crewai/agent.py b/src/crewai/agent.py similarity index 100% rename from crewai/agent.py rename to src/crewai/agent.py diff --git a/crewai/agents/__init__.py b/src/crewai/agents/__init__.py similarity index 100% rename from crewai/agents/__init__.py rename to src/crewai/agents/__init__.py diff --git a/crewai/agents/cache/__init__.py b/src/crewai/agents/cache/__init__.py similarity index 100% rename from crewai/agents/cache/__init__.py rename to src/crewai/agents/cache/__init__.py diff --git a/crewai/agents/cache/cache_handler.py b/src/crewai/agents/cache/cache_handler.py similarity index 100% rename from crewai/agents/cache/cache_handler.py rename to src/crewai/agents/cache/cache_handler.py diff --git a/crewai/agents/cache/cache_hit.py b/src/crewai/agents/cache/cache_hit.py similarity index 100% rename from crewai/agents/cache/cache_hit.py rename to src/crewai/agents/cache/cache_hit.py diff --git a/crewai/agents/exceptions.py b/src/crewai/agents/exceptions.py similarity index 100% rename from crewai/agents/exceptions.py rename to src/crewai/agents/exceptions.py diff --git a/crewai/agents/executor.py b/src/crewai/agents/executor.py similarity index 100% rename from crewai/agents/executor.py rename to src/crewai/agents/executor.py diff --git a/crewai/agents/output_parser.py b/src/crewai/agents/output_parser.py similarity index 100% rename from crewai/agents/output_parser.py rename to src/crewai/agents/output_parser.py diff --git a/crewai/agents/tools_handler.py b/src/crewai/agents/tools_handler.py similarity index 100% rename from crewai/agents/tools_handler.py rename to src/crewai/agents/tools_handler.py diff --git a/crewai/crew.py b/src/crewai/crew.py similarity index 100% rename from crewai/crew.py rename to src/crewai/crew.py diff --git a/crewai/process.py b/src/crewai/process.py similarity index 100% rename from crewai/process.py rename to src/crewai/process.py diff --git a/crewai/prompts.py b/src/crewai/prompts.py similarity index 83% rename from crewai/prompts.py rename to src/crewai/prompts.py index c805ebb65..f90305848 100644 --- a/crewai/prompts.py +++ b/src/crewai/prompts.py @@ -3,7 +3,8 @@ import os from typing import ClassVar, Dict, Optional from langchain.prompts import PromptTemplate -from pydantic import BaseModel, Field, PrivateAttr, model_validator, ValidationError +from pydantic import BaseModel, Field, PrivateAttr, ValidationError, model_validator + class Prompts(BaseModel): """Manages and generates prompts for a generic agent with support for different languages.""" @@ -24,7 +25,9 @@ class Prompts(BaseModel): with open(prompts_path, "r") as f: self._prompts = json.load(f)["slices"] except FileNotFoundError: - raise ValidationError(f"Prompt file for language '{self.language}' not found.") + raise ValidationError( + f"Prompt file for language '{self.language}' not found." + ) except json.JSONDecodeError: raise ValidationError(f"Error decoding JSON from the prompts file.") return self @@ -45,6 +48,10 @@ class Prompts(BaseModel): def _build_prompt(self, components: [str]) -> str: """Constructs a prompt string from specified components.""" - prompt_parts = [self._prompts[component] for component in components if component in self._prompts] + prompt_parts = [ + self._prompts[component] + for component in components + if component in self._prompts + ] prompt_parts.append(self.SCRATCHPAD_SLICE) return PromptTemplate.from_template("".join(prompt_parts)) diff --git a/crewai/prompts/en.json b/src/crewai/prompts/en.json similarity index 100% rename from crewai/prompts/en.json rename to src/crewai/prompts/en.json diff --git a/crewai/task.py b/src/crewai/task.py similarity index 100% rename from crewai/task.py rename to src/crewai/task.py diff --git a/crewai/tools/__init__.py b/src/crewai/tasks/__init__.py similarity index 100% rename from crewai/tools/__init__.py rename to src/crewai/tasks/__init__.py diff --git a/crewai/tasks/task_output.py b/src/crewai/tasks/task_output.py similarity index 100% rename from crewai/tasks/task_output.py rename to src/crewai/tasks/task_output.py diff --git a/src/crewai/tools/__init__.py b/src/crewai/tools/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/crewai/tools/agent_tools.py b/src/crewai/tools/agent_tools.py similarity index 100% rename from crewai/tools/agent_tools.py rename to src/crewai/tools/agent_tools.py diff --git a/crewai/tools/cache_tools.py b/src/crewai/tools/cache_tools.py similarity index 100% rename from crewai/tools/cache_tools.py rename to src/crewai/tools/cache_tools.py