Merge branch 'main' into hf-main

Clean branch without corruption from failed rebase

.dockerignore

@@ -0,0 +1,20 @@
+# Prevent secrets and junk from being baked into Docker images
+
+# Secrets
+.env
+.env.*
+
+# macOS junk
+.DS_Store
+
+# Python cache
+__pycache__/
+*.py[cod]
+
+# Virtual environments
+.venv/
+venv/
+
+# Git stuff (optional)
+.git
+.gitignore

.env.sample

@@ -0,0 +1 @@
+OPENAI_API_KEY=###

.gitignore

@@ -0,0 +1,161 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+.chainlit/
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

Dockerfile

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 FROM python:3.9
 RUN useradd -m -u 1000 user
 USER user
@@ -11,3 +12,47 @@ COPY . .
 #Force install specific chainlit version
 RUN pip install chainlit==2.3.0
 CMD ["chainlit", "run", "app.py", "--port", "7860"]
+=======
+# Get a distribution that has uv already installed
+FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim
+
+# Add Rust compiler installation
+USER root
+RUN apt-get update && apt-get install -y \
+    curl \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+# Add user - this is the user that will run the app
+# If you do not set user, the app will run as root (undesirable)
+RUN useradd -m -u 1000 user
+USER user
+
+# Set up Rust for the user
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/home/user/.cargo/bin:${PATH}"
+
+# Set the home directory and path
+ENV HOME=/home/user \
+    PATH=/home/user/.local/bin:$PATH        
+
+ENV UVICORN_WS_PROTOCOL=websockets
+
+# Set the working directory
+WORKDIR $HOME/app
+
+# Copy the app to the container
+COPY --chown=user . $HOME/app
+
+# Install the dependencies
+# RUN uv sync --frozen
+RUN uv sync
+
+# Expose the port
+EXPOSE 7860
+
+# Run the app
+CMD ["uv", "run", "chainlit", "run", "app.py", "--host", "0.0.0.0", "--port", "7860"]
+>>>>>>> main

README.md

@@ -5,6 +5,7 @@ colorFrom: pink
 colorTo: yellow
 sdk: docker
 pinned: false
+app_port: 7860
 ---
 
 <p align = "center" draggable=”false” ><img src="https://github.com/AI-Maker-Space/LLM-Dev-101/assets/37101144/d1343317-fa2f-41e1-8af1-1dbb18399719" 
@@ -53,9 +54,19 @@ That's it! Head to the next step and start building your application!
      cd Beyond-ChatGPT
      ```
 
-3. Install the packages required for this python envirnoment in `requirements.txt`.
+3. Create a virtual environment and install dependencies.
      ``` bash
-     pip install -r requirements.txt
+     # Create a virtual environment
+     uv venv
+
+     # Activate the virtual environment
+     # On macOS/Linux:
+     source .venv/bin/activate
+     # On Windows:
+     # .venv\Scripts\activate
+
+     # Install dependencies from pyproject.toml
+     uv sync
      ``` 
 
 4. Open your `.env` file. Replace the `###` in your `.env` file with your OpenAI Key and save the file.
@@ -63,18 +74,18 @@ That's it! Head to the next step and start building your application!
      OPENAI_API_KEY=sk-###
      ```
 
-5. Let's try deploying it locally. Make sure you're in the python environment where you installed Chainlit and OpenAI. Run the app using Chainlit. This may take a minute to run.
+5. Let's try deploying it locally. Make sure you're in the activated virtual environment. Run the app using Chainlit. This may take a minute to run.
      ``` bash
-     chainlit run app.py -w
+     uv run chainlit run app.py -w
      ```
 
-<p align = "center" draggable=”false”>
+<p align = "center" draggable="false">
 <img src="https://github.com/AI-Maker-Space/LLMOps-Dev-101/assets/37101144/54bcccf9-12e2-4cef-ab53-585c1e2b0fb5"> 
 </p>
 
 Great work! Let's see if we can interact with our chatbot.
 
-<p align = "center" draggable=”false”>
+<p align = "center" draggable="false">
 <img src="https://github.com/AI-Maker-Space/LLMOps-Dev-101/assets/37101144/854e4435-1dee-438a-9146-7174b39f7c61"> 
 </p> 
 
@@ -86,7 +97,7 @@ Awesome! Time to throw it into a docker container and prepare it for shipping!
 <details>
   <summary>🐳 Containerizing our App</summary>
 
-1. Let's build the Docker image. We'll tag our image as `llm-app` using the `-t` parameter. The `.` at the end means we want all of the files in our current directory to be added to our image.
+1. Let's build the Docker image. We'll tag our image as `llm-app` using the `-t` parameter. The `.` at the end means we want all of the files in our current directory to be added to our image. Note that our Dockerfile is set up to use uv for dependency management and will install all the packages defined in our pyproject.toml file.
      
      ``` bash
      docker build -t llm-app .
@@ -100,7 +111,7 @@ Awesome! Time to throw it into a docker container and prepare it for shipping!
 
 3. Visit http://localhost:7860 in your browser to see if the app runs correctly.
 
-<p align = "center" draggable=”false”>
+<p align = "center" draggable="false">
 <img src="https://github.com/AI-Maker-Space/LLMOps-Dev-101/assets/37101144/2c764f25-09a0-431b-8d28-32246e0ca1b7"> 
 </p>
 

app.py

@@ -1,15 +1,14 @@
 # You can find this code for Chainlit python streaming here (https://docs.chainlit.io/concepts/streaming/python)
 
 # OpenAI Chat completion
+import os
+from openai import AsyncOpenAI  # importing openai for API usage
+import chainlit as cl  # importing chainlit for our app
+from chainlit.prompt import Prompt, PromptMessage  # importing prompt tools
+from chainlit.playground.providers import ChatOpenAI  # importing ChatOpenAI tools
+from dotenv import load_dotenv
 
-import openai #importing openai for API usage
-import chainlit as cl #importing chainlit for our app
-from chainlit.input_widget import Select, Switch, Slider #importing chainlit settings selection tools
-from chainlit.prompt import Prompt, PromptMessage #importing prompt tools 
-from chainlit.playground.providers import ChatOpenAI #importing ChatOpenAI tools
-
-# You only need the api key inserted here if it's not in your .env file
-#openai.api_key = "YOUR_API_KEY"
+load_dotenv()
 
 # ChatOpenAI Templates
 system_template = """You are a helpful assistant who always speaks in a pleasant tone!
@@ -19,7 +18,8 @@ user_template = """{input}
 Think through your response step by step.
 """
 
-@cl.on_chat_start # marks a function that will be executed at the start of a user session
+
+@cl.on_chat_start  # marks a function that will be executed at the start of a user session
 async def start_chat():
     settings = {
         "model": "gpt-3.5-turbo",
@@ -32,11 +32,15 @@ async def start_chat():
 
     cl.user_session.set("settings", settings)
 
-@cl.on_message # marks a function that should be run each time the chatbot receives a message from a user
-async def main(message):
 
+@cl.on_message  # marks a function that should be run each time the chatbot receives a message from a user
+async def main(message: cl.Message):
     settings = cl.user_session.get("settings")
 
+    client = AsyncOpenAI()
+
+    print(message.content)
+
     prompt = Prompt(
         provider=ChatOpenAI.id,
         messages=[
@@ -47,12 +51,12 @@ async def main(message):
             ),
             PromptMessage(
                 role="user",
-                template=user_template, 
-                formatted=user_template.format(input=message),
-            )
+                template=user_template,
+                formatted=user_template.format(input=message.content),
+            ),
         ],
-        inputs = {"input" : message.content},
-        settings=settings
+        inputs={"input": message.content},
+        settings=settings,
     )
 
     print([m.to_openai() for m in prompt.messages])
@@ -60,10 +64,12 @@ async def main(message):
     msg = cl.Message(content="")
 
     # Call OpenAI
-    async for stream_resp in await openai.ChatCompletion.acreate(
+    async for stream_resp in await client.chat.completions.create(
         messages=[m.to_openai() for m in prompt.messages], stream=True, **settings
     ):
-        token = stream_resp.choices[0]["delta"].get("content", "")
+        token = stream_resp.choices[0].delta.content
+        if not token:
+            token = ""
         await msg.stream_token(token)
 
     # Update the prompt object with the completion

pyproject.toml

@@ -0,0 +1,14 @@
+[project]
+name = "beyond-chatgpt"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.13"
+dependencies = [
+    "chainlit==0.7.700",
+    "cohere==4.37",
+    "openai==1.3.5",
+    "pydantic==2.10.1",
+    "python-dotenv==1.0.0",
+    "tiktoken==0.5.1",
+]

testload.py

@@ -0,0 +1,12 @@
+from dotenv import load_dotenv
+import os
+
+load_dotenv()  # Looks for a file named ".env" in the current directory
+
+api_key = os.getenv("OPENAI_API_KEY")
+
+if api_key:
+    print("✅ API key loaded successfully.")
+    print("First 8 characters:", api_key[:8] + "...")
+else:
+    print("❌ API key not found. Check your .env file formatting.")