Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow running on remote orchestrator #80

Merged
merged 5 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion langchain-llamaindex-slackbot/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ dmypy.json
.pyre/

# Zenml
.zen/
src/.zen/

# MLflow
mlruns/
Expand Down
14 changes: 10 additions & 4 deletions langchain-llamaindex-slackbot/src/local_testing_slackbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
get_vector_store,
)
from zenml.logger import get_logger
from zenml.client import Client

SLACK_BOT_TOKEN = (Client().get_secret("langchain_project_secret")
.secret_values["slack_bot_token"])
SLACK_APP_TOKEN = (Client().get_secret("langchain_project_secret")
.secret_values["slack_app_token"])
OPENAI_API_KEY = (Client().get_secret("langchain_project_secret")
.secret_values["openai_api_key"])

SLACK_BOT_TOKEN = os.getenv("SLACK_BOT_TOKEN")
SLACK_APP_TOKEN = os.getenv("SLACK_APP_TOKEN")
OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
PIPELINE_NAME = os.getenv("PIPELINE_NAME", "zenml_docs_index_generation")

logger = get_logger(__name__)
Expand Down Expand Up @@ -77,7 +82,7 @@ def reply_in_thread(body: dict, say, context):
thread_ts = event.get("thread_ts", None) or event["ts"]

if context["bot_user_id"] in event["text"]:
logger.debug(f"Received message: {event['text']}")
logger.info(f"Received message: {event['text']}")
if event.get("thread_ts", None):
full_thread = [
f"{msg['text']}"
Expand Down Expand Up @@ -107,6 +112,7 @@ def reply_in_thread(body: dict, say, context):
question=event["text"],
verbose=True,
)
logger.info(output)
say(text=output, thread_ts=thread_ts)


Expand Down
24 changes: 21 additions & 3 deletions langchain-llamaindex-slackbot/src/pipelines/index_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,35 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing
# permissions and limitations under the License.

import os

from steps.index_generator import index_generator
from steps.url_scraper import url_scraper
from steps.web_url_loader import web_url_loader
from zenml import pipeline
from zenml.config import DockerSettings
from zenml.config.docker_settings import SourceFileMode

pipeline_name = "zenml_docs_index_generation"
docker_settings = DockerSettings(
requirements=[
"langchain==0.0.263",
"openai==0.27.2",
"slack-bolt==1.16.2",
"slack-sdk==3.20.0",
"fastapi",
"flask",
"uvicorn",
"gcsfs==2023.5.0",
"faiss-cpu==1.7.3",
"unstructured==0.5.7",
"tiktoken",
"bs4"
],
Comment on lines +25 to +38
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't tell if this is different from the fixed files themselves, but would it be possible instead to just specify the requirements file itself? Seems safer, given that these files do actually get updated fairly often.

docker_settings = DockerSettings(requirements="/path/to/requirements.txt")

source_files=SourceFileMode.DOWNLOAD
)


@pipeline(name=pipeline_name)
@pipeline(name=pipeline_name, settings={"docker": docker_settings})
def docs_to_index_pipeline(
docs_url: str = "",
repo_url: str = "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ langchain==0.0.263
openai==0.27.2
slack-bolt==1.16.2
slack-sdk==3.20.0
zenml[connectors-gcp]==0.45.3
zenml[connectors-gcp]==0.45.5
fastapi
flask
uvicorn
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ langchain>=0.0.125,<=0.0.263
openai>=0.27.2,<=0.27.8
slack-bolt==1.16.2
slack-sdk==3.20.0
zenml==0.44.1
zenml==0.45.6
fastapi
flask
uvicorn
Expand All @@ -11,3 +11,4 @@ faiss-cpu>=1.7.3,<=1.7.4
unstructured>=0.5.7,<=0.7.8
lanarky==0.7.12
tiktoken
bs4
3 changes: 3 additions & 0 deletions langchain-llamaindex-slackbot/src/steps/index_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing
# permissions and limitations under the License.
import os

from typing import List

Expand All @@ -21,10 +22,12 @@
)
from langchain.vectorstores import FAISS, VectorStore
from zenml import step
from zenml.client import Client


@step(enable_cache=False)
def index_generator(documents: List[Document]) -> VectorStore:
os.environ["OPENAI_API_KEY"] = Client().get_secret("langchain_project_secret").secret_values["openai_api_key"]
embeddings = OpenAIEmbeddings()

text_splitter = CharacterTextSplitter(chunk_size=1000, chunk_overlap=0)
Expand Down
2 changes: 1 addition & 1 deletion langchain-llamaindex-slackbot/src/steps/url_scraper.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

from steps.url_scraping_utils import get_all_pages
from zenml import step
from zenml.client import Client


@step(enable_cache=True)
Expand All @@ -36,5 +37,4 @@ def url_scraper(
Returns:
List of URLs to scrape.
"""
# examples_readme_urls = get_nested_readme_urls(repo_url)
return get_all_pages(docs_url)
Loading