Merge branch 'main' of github.com:lukas-holzner/codefusion-hackathon

backend/app/ai_manager.py

@@ -1,8 +1,13 @@
 import os
 from dotenv import load_dotenv
+from fastapi import UploadFile, HTTPException
+from fastapi.responses import FileResponse
 from openai import OpenAI
 from typing import List, Dict
 import json
+import io
+import tempfile
+from starlette.background import BackgroundTask
 
 # Load environment variables from .env file
 load_dotenv()
@@ -40,6 +45,7 @@ def process_user_message(system_message: str, messages: List[str]) -> Dict[str,
     """
     try:
         # Debug: Print input messages
+        print("Debug: System message:", system_message)
         print("Debug: Input messages:", messages)
 
         # Call the OpenAI API with the system message and messages list
@@ -70,7 +76,7 @@ def process_user_message(system_message: str, messages: List[str]) -> Dict[str,
             agenda = json.loads(f"[{agenda_str}]")
 
             # Remove the agenda from the assistant's response
-            assistant_response = assistant_response[:agenda_start-len("<agenda>")] + assistant_response[agenda_end+len("</agenda>"):]
+            #assistant_response = assistant_response[:agenda_start-len("<agenda>")] + assistant_response[agenda_end+len("</agenda>"):]
 
         # Remove #EOC# marker from the response
         assistant_response = assistant_response.replace("#EOC#", "").strip()
@@ -133,3 +139,58 @@ def process_user_message(system_message: str, messages: List[str]) -> Dict[str,
             break
 
     print("Conversation ended.")
+
+async def convert_audio_to_text(audio_file: UploadFile):
+    """
+    Convert an uploaded audio file to text using OpenAI's Whisper model.
+    """
+    try:
+        # Read the file content
+        file_content = await audio_file.read()
+
+        # Create a file-like object from the content
+        audio_file_obj = io.BytesIO(file_content)
+        audio_file_obj.name = audio_file.filename  # Set the filename
+
+        # Call the OpenAI API to transcribe the audio
+        transcript = client.audio.transcriptions.create(
+            model="whisper-1",
+            file=audio_file_obj,
+            response_format="text"
+        )
+
+        return transcript
+    except Exception as e:
+        print(f"Error in audio transcription: {str(e)}")
+        return None
+
+async def convert_text_to_audio(text: str, voice: str = "alloy"):
+    """
+    Convert text to audio using OpenAI's text-to-speech API and return a FastAPI FileResponse.
+    
+    :param text: The text to convert to speech
+    :param voice: The voice to use (default is "alloy")
+    :return: A FastAPI FileResponse containing the audio file
+    """
+    try:
+        response = client.audio.speech.create(
+            model="tts-1",
+            voice=voice,
+            input=text
+        )
+
+        # Create a temporary file to store the audio content
+        with tempfile.NamedTemporaryFile(delete=False, suffix=".mp3") as temp_file:
+            temp_file.write(response.content)
+            temp_file_path = temp_file.name
+
+        # Return a FileResponse
+        return FileResponse(
+            path=temp_file_path,
+            media_type="audio/mpeg",
+            filename="speech.mp3",
+            background=BackgroundTask(lambda: os.unlink(temp_file_path))
+        )
+    except Exception as e:
+        print(f"Error in text-to-speech conversion: {str(e)}")
+        raise HTTPException(status_code=500, detail="Text-to-speech conversion failed")

backend/app/main.py

@@ -6,7 +6,7 @@
 from fastapi.middleware.cors import CORSMiddleware
 from .database import engine
 from . import models
-from .routers import meetings, users, test
+from .routers import meetings, users, tts
 import os
 
 models.Base.metadata.create_all(bind=engine)
@@ -32,9 +32,9 @@
 )
 
 # Include the router with the /api prefix
-app.include_router(meetings.router, tags=["meetings"])
-app.include_router(users.router, tags=["users"])
-app.include_router(test.router, tags=["test"])
+app.include_router(meetings.router, tags=["Meetings"])
+app.include_router(users.router, tags=["Users"])
+app.include_router(tts.router, tags=["TTS"])
 
 @app.get("/", include_in_schema=False)
 async def serve_index():

backend/app/routers/meetings.py

@@ -1,21 +1,26 @@
 from datetime import datetime
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, UploadFile, File
 from sqlalchemy.orm import Session
 from typing import List
+import os
 
 from app.routers.users import get_user
-from app.ai_manager import generate_initial_prompt, process_user_message
+from app.ai_manager import generate_initial_prompt, process_user_message, convert_audio_to_text
 from .. import schemas
 from ..database import get_db
 from ..models import Conversation, Meeting, ChatMessage, MeetingAgenda
 from ..util.openai import init_conversation, generate_response
 
 import logging
+import re
 
 logger = logging.getLogger(__name__)
 
 router = APIRouter()
 
+AUDIO_MIME_TYPES = ["audio/mpeg", "audio/mp3", "audio/wav", "audio/ogg"]
+MAX_FILE_SIZE = 5 * 1024 * 1024  # 5 MB in bytes
+
 # Meeting CRUD operations
 def get_meeting(db: Session, meeting_id: int):
     return db.query(Meeting).filter(Meeting.id == meeting_id).first()
@@ -78,6 +83,10 @@ def add_message(db: Session, meeting_id: int, user_id: int, message: schemas.Cha
 
     # Create MeetingAgenda objects only if agenda exists and is not empty
     if "agenda" in assistant_response and assistant_response["agenda"]:
+        # Delete existing agenda items
+        db.query(MeetingAgenda).filter(MeetingAgenda.conversation_id == db_conversation.id).delete()
+
+        # Add new agenda items
         for agenda_item in assistant_response["agenda"]:
             db_conversation.meeting_agenda.append(MeetingAgenda(
                 agenda_item=agenda_item,
@@ -126,6 +135,11 @@ def read_meetings(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)
     return meetings
 
 @router.get("/meetings/{meeting_id}", response_model=schemas.MeetingSchema)
+def read_meeting_route(meeting_id: int, db: Session = Depends(get_db)):
+    db_meeting = get_meeting(db, meeting_id=meeting_id)
+    if db_meeting is None:
+        raise HTTPException(status_code=404, detail="Meeting not found")
+    return db_meeting
 
 @router.put("/meetings/{meeting_id}", response_model=schemas.Meeting)
 def update_meeting_route(meeting_id: int, meeting: schemas.MeetingCreate, db: Session = Depends(get_db)):
@@ -171,11 +185,39 @@ def create_conversation(meeting_id: int, user_id: int, db: Session = Depends(get
         db_conversation = create_new_conversation(db, meeting_id=meeting_id, user_id=user_id)
     else:
         db_conversation = get_conversation(db, meeting_id=meeting_id, user_id=user_id)
+
+    db_conversation.chat_messages = extract_and_format_agenda(db_conversation.chat_messages)
     return db_conversation
 
 @router.post("/meetings/{meeting_id}/{user_id}/conversation/message", response_model=schemas.Conversation)
 def router_add_message(meeting_id: int, user_id: int, message: str, db: Session = Depends(get_db)):
-    return add_message(db, meeting_id=meeting_id, user_id=user_id, message=ChatMessage(message=message, author="user", timestamp=datetime.now()))
+    ret = add_message(db, meeting_id=meeting_id, user_id=user_id, message=ChatMessage(message=message, author="user", timestamp=datetime.now()))
+
+    ret.chat_messages = extract_and_format_agenda(ret.chat_messages)
+    return ret
+
+@router.post("/meetings/{meeting_id}/{user_id}/conversation/message_audio", response_model=schemas.Conversation)
+async def router_add_message_audio(
+    meeting_id: int, 
+    user_id: int, 
+    audio_file: UploadFile = File(...), 
+    db: Session = Depends(get_db)
+):
+    # Check file type
+    if audio_file.content_type not in AUDIO_MIME_TYPES:
+        raise HTTPException(status_code=400, detail="Invalid file type. Only audio files are allowed.")
+
+    # Check file size
+    file_size = await audio_file.read()
+    await audio_file.seek(0)  # Reset file pointer to the beginning
+    if len(file_size) > MAX_FILE_SIZE:
+        raise HTTPException(status_code=400, detail="File size exceeds the 5 MB limit.")
+
+    audio_text = await convert_audio_to_text(audio_file)
+    if audio_text is None:
+        raise HTTPException(status_code=500, detail="Failed to transcribe audio file.")
+
+    return router_add_message(meeting_id, user_id, audio_text, db)
 
 @router.delete("/meetings/{meeting_id}/{user_id}/conversation", response_model=schemas.Conversation)
 def delete_conversation(meeting_id: int, user_id: int, db: Session = Depends(get_db)):
@@ -184,7 +226,41 @@ def delete_conversation(meeting_id: int, user_id: int, db: Session = Depends(get
         raise HTTPException(status_code=404, detail="Conversation not found")
     db.delete(db_conversation)
     db.commit()
-    return db_conversation  
-
+    return db_conversation
 
+@router.post("/meetings/{meeting_id}/{user_id}/conversation/update_agenda", response_model=schemas.Conversation)
+def update_agenda(
+    meeting_id: int, 
+    user_id: int, 
+    agenda: List[schemas.MeetingAgenda], 
+    db: Session = Depends(get_db)
+):
+    db_conversation = get_conversation(db, meeting_id=meeting_id, user_id=user_id)
+    if db_conversation is None:
+        raise HTTPException(status_code=404, detail="Conversation not found")
+
+    # Clear existing agenda items
+    db_conversation.meeting_agenda.clear()
+
+    # Create new MeetingAgenda objects and add them to the conversation
+    for item in agenda:
+        new_agenda_item = MeetingAgenda(
+            agenda_item=item.agenda_item,
+            completed=item.completed,
+            conversation_id=db_conversation.id
+        )
+        db_conversation.meeting_agenda.append(new_agenda_item)
+
+    db.commit()
+    db.refresh(db_conversation)
+    return db_conversation
 
+def extract_and_format_agenda(messages):
+    for message in messages:
+        agenda_match = re.search(r'<agenda>(.*?)</agenda>', message.message, re.DOTALL)
+        if agenda_match:
+            agenda_content = agenda_match.group(1)
+            agenda_items = [item.strip() for item in agenda_content.split(',')]
+            formatted_agenda = '\n'.join(f"{i+1}. {item}" for i, item in enumerate(agenda_items))
+            message.message = re.sub(r'<agenda>.*?</agenda>', formatted_agenda, message.message, flags=re.DOTALL)
+    return messages

backend/app/routers/tts.py

@@ -0,0 +1,10 @@
+from fastapi import APIRouter, Body
+from fastapi.responses import FileResponse
+from app.ai_manager import convert_text_to_audio
+
+
+router = APIRouter()
+
+@router.post("/tts/")
+async def tts(text: str = Body(...), voice: str = Body("alloy")):
+    return await convert_text_to_audio(text, voice)

backend/app/routers/users.py

@@ -75,3 +75,11 @@ def delete_user_route(user_id: int, db: Session = Depends(get_db)):
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
     return db_user
+
+@router.get("/users/{user_id}/meetings", response_model=List[schemas.Meeting])
+def read_user_meetings(user_id: int, db: Session = Depends(get_db)):
+    db_user = get_user(db, user_id=user_id)
+    if db_user is None:
+        raise HTTPException(status_code=404, detail="User not found")
+    return db_user.meetings
+

backend/requirements.txt

@@ -4,4 +4,4 @@ sqlalchemy
 pydantic
 python-dotenv
 openai
-
+python-multipart

frontend/src/components/AgendaDrawer/AgendaDrawer.tsx

@@ -0,0 +1,67 @@
+import React from "react";
+import {
+  Drawer,
+  IconButton,
+  List,
+  ListItem,
+  ListItemIcon,
+  ListItemText,
+  Typography,
+  useMediaQuery,
+  useTheme,
+} from "@mui/material";
+import FormatListBulletedIcon from "@mui/icons-material/FormatListBulleted";
+import CircleIcon from '@mui/icons-material/Circle';
+
+type AgendaItem = {
+    agenda_item: string;
+    completed: boolean;
+}
+
+type AgendaDrawerProps = {
+    agendaItems: AgendaItem[];
+    isOpen: boolean;
+    onClose: () => void;
+}
+
+export const AgendaDrawerWidth = 250;
+
+export const AgendaDrawer: React.FC<AgendaDrawerProps> = ({ agendaItems, isOpen, onClose }) => {
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+
+  const drawerContent = (
+    <List>
+      <Typography variant="h6" sx={{ p: 2, mt: 8 }}>
+        Agenda
+      </Typography>
+      {agendaItems.map((item, index) => (
+        <ListItem key={index}>
+            <ListItemIcon sx={{ minWidth: '16px' }}>
+                <CircleIcon sx={{width: '8px', height: '8px'}} />
+            </ListItemIcon>
+            <ListItemText primary={item.agenda_item} />
+        </ListItem>
+      ))}
+    </List>
+  );
+
+  return (
+    <Drawer
+      anchor="right"
+      open={isOpen}
+      onClose={onClose}
+      variant={isMobile ? "temporary" : "permanent"}
+      sx={{
+        width: AgendaDrawerWidth,
+        flexShrink: 0,
+        '& .MuiDrawer-paper': {
+          width: AgendaDrawerWidth,
+          boxSizing: 'border-box',
+        },
+      }}
+    >
+      {drawerContent}
+    </Drawer>
+  );
+};

frontend/src/components/drawer/Drawer.tsx → frontend/src/components/MeetingsDrawer/MeetingsDrawer.tsx

@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import React from 'react'
 import { Link } from 'react-router-dom'
 import { useQuery } from '@tanstack/react-query'
@@ -17,7 +19,7 @@ import {
 import HomeIcon from '@mui/icons-material/Home'
 import MeetingRoomIcon from '@mui/icons-material/MeetingRoom'
 
-import './Drawer.css'
+import './MeetingsDrawer.css'
 
 const fetchMeetings = async () => {
 	const response = await fetch('https://codefusion.lholz.de/meetings/?skip=0&limit=100')
@@ -57,7 +59,7 @@ const getDayName = (date) => {
 	return date.toLocaleDateString('en-US', { weekday: 'long' })
 }
 
-export const Drawer = ({
+export const MeetingsDrawer = ({
 	isLargeScreen,
 	mobileOpen,
 	handleDrawerToggle,