✨ Added main router and integrated ollama & codelama endpoints

.gitignore

@@ -0,0 +1,11 @@
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+*.db
+*.sqlite
+.env
+*.env
+*.log
+venv/
+qvenv/

api/endpoints/codelama.py

@@ -1,16 +1,10 @@
-from fastapi import FastAPI
-import subprocess  # Import subprocess module to run system commands
-import ollama
+# api/endpoints/codelama.py
 
-app = FastAPI()
+from fastapi import APIRouter, HTTPException
 
-@app.get("/")
-def read_root():
-    return {"message": "Welcome to the Quantum-API/codelama"}
+router = APIRouter()
 
-# Add other endpoints as needed for interacting with ollama
-@app.get("/run-codelama")
-def run_codelama():
-    # You can call ollama commands here or use subprocess
-    result = subprocess.run(["ollama", "run", "codellama:latest"], capture_output=True, text=True)
-    return {"result": result.stdout}
+@router.post("/")
+async def run_codelama(payload: dict):
+    # Placeholder logic
+    return {"status": "success", "received_input": payload}

api/endpoints/ollama.py

@@ -1,29 +1,9 @@
-from fastapi import FastAPI, APIRouter
-from pydantic import BaseModel
-import ollama  # Make sure Ollama is installed and available
+from fastapi import APIRouter, Request
 
-app = FastAPI()
-
-# Define request model for the input data
-class UserInput(BaseModel):
-    question: str
-
-# Function to generate responses using Ollama
-def get_ollama_response(user_input: str) -> str:
-    try:
-        # Run Ollama model for generating a response
-        response = ollama.chat(model="llama", messages=[{"role": "user", "content": user_input}])
-        return response['text']  # Ensure you're extracting the response text from Ollama's response
-    except Exception as e:
-        return f"Error processing request: {str(e)}"
-
-# Create an API router
 router = APIRouter()
 
-@router.post("/ollama-response")
-async def ollama_response(user_input: UserInput):
-    response = get_ollama_response(user_input.question)
-    return {"response": response}
-
-# Include router into the FastAPI app
-app.include_router(router)
+@router.post("/")
+async def ollama_response(request: Request):
+    data = await request.json()
+    question = data.get("question", "No question provided.")
+    return {"response": f"Olama received: {question}"}

api/main.py

@@ -0,0 +1,8 @@
+from fastapi import FastAPI
+from api.endpoints import codelama, ollama
+
+app = FastAPI()
+
+# Register routers if you have them
+app.include_router(codelama.router, prefix="/run-codelama")
+app.include_router(ollama.router, prefix="/ollama-response")

app/app.py

@@ -2,8 +2,8 @@ import streamlit as st
 import requests
 
 # URL of the FastAPI backend endpoint
-API_URL_OLAMA = "http://localhost:7860/ollama-response"
-API_URL_CODELAMA = "http://localhost:7860/run-codelama"
+API_URL_OLAMA = "http://localhost:7860/ollama/response"
+API_URL_CODELAMA = "http://localhost:7860/codelama/run"
 
 def main():
     st.title("Quantum-API Chat Interface with Olama and CodeLlama")
@@ -18,7 +18,7 @@ def main():
                 # Display the response from Olama
                 st.write(f"Olama says: {response.json()['response']}")
             else:
-                st.error("Error contacting Olama API.")
+                st.error(f"Error contacting Olama API: {response.status_code}")
 
         if st.button("Run Code with CodeLlama"):
             # Make a GET request to the FastAPI server for CodeLlama
@@ -27,7 +27,7 @@ def main():
                 # Display the response from CodeLlama
                 st.write(f"CodeLlama result: {response.json()['result']}")
             else:
-                st.error("Error contacting CodeLlama API.")
+                st.error(f"Error contacting CodeLlama API: {response.status_code}")
         
 if __name__ == "__main__":
     main()

start.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+echo "🚀 Activating Quantum-API Startup"
+
+# Start FastAPI (api.main:app) on port 7860
+echo "🌀 Starting FastAPI on port 7860..."
+uvicorn api.main:app --host 0.0.0.0 --port 7860 &> fastapi.log &
+
+# Wait 3 seconds
+sleep 3
+
+# Show FastAPI logs if it failed
+if ! pgrep -f "uvicorn api.main:app" > /dev/null; then
+    echo "❌ FastAPI failed to start. Logs:"
+    cat fastapi.log
+    exit 1
+else
+    echo "✅ FastAPI is running."
+fi
+
+# Start Streamlit app on port 8000
+echo "✨ Launching Streamlit on port 8000..."
+streamlit run app/app.py --server.port 8000