Merge pull request #288 from splashcat-ink/openai-groups-creating

Openai groups creating

assistant/functions.py

@@ -0,0 +1,18 @@
+from django.db import transaction
+
+from battles.models import Battle, BattleGroup
+from users.models import User
+
+
+def create_battle_group(user: User, params: dict) -> int:
+    battles = params.get('battles', [])
+    with transaction.atomic():
+        battles = Battle.objects.filter(pk__in=battles, uploader=user)
+        group = BattleGroup(creator=user)
+        group.save()
+
+        group.battles.add(*battles)
+
+        group.save()
+
+        return group.id

assistant/views.py

@@ -1,4 +1,5 @@
 # Create your views here.
+import json
 
 import django_htmx.http
 from django.conf import settings
@@ -10,7 +11,7 @@
 from django.views.decorators.http import require_POST
 from openai import OpenAI
 
-from assistant import orchestrator
+from assistant import orchestrator, functions
 from assistant.forms import CreateThreadForm
 from assistant.models import Thread, SharedThread
 from battles.models import Battle, BattleGroup
@@ -117,6 +118,25 @@ def get_thread_messages(request, thread_id):
     latest_run = latest_run.data[0] if len(latest_run.data) > 0 else None
     latest_status = latest_run.status if latest_run else 'completed'
 
+    if latest_status == 'requires_action' and latest_run.required_action:
+        # need to call functions
+        outputs = []
+
+        required_action = latest_run.required_action
+        tools = required_action.submit_tool_outputs.tool_calls
+        for tool in tools:
+            function_name = tool.function.name
+            python_function = getattr(functions, function_name)
+            if python_function:
+                result = python_function(thread.creator, params=json.loads(tool.function.arguments))
+                outputs.append({
+                    'tool_call_id': tool.id,
+                    'output': str(result),
+                })
+
+        latest_run = client.beta.threads.runs.submit_tool_outputs(thread_id=openai_thread_id, run_id=latest_run.id,
+                                                                  tool_outputs=outputs)
+
     is_currently_done = latest_status in ['completed', 'expired', 'cancelled',
                                           'failed'] and thread.status != thread.Status.PENDING
 

battles/templates/battles/groups/view.html

@@ -4,7 +4,7 @@
 {% block opengraph_head %}
     <meta property="og:title" content="{{ battle_group.creator.display_name }}'s Shared Battle Group">
 
-    <meta property="og:description" content="Splashcat records battle data for later analysis.">
+    <meta property="og:description" content="Splashcat is an award-winning service that records battle data for later analysis.">
 
     <meta name="twitter:card" content="summary_large_image">
     <meta property="og:image"

battles/templates/battles/view_battle.html

@@ -10,7 +10,7 @@
     <meta property="og:description" content="{% if battle.gpt_description_generated %}
         {{ battle.gpt_description }}
     {% else %}
-        Splashcat records battle data for later analysis.
+        Splashcat is an award-winning service that records battle data for later analysis.
     {% endif %}">
 
     <meta name="twitter:card" content="summary_large_image">

battles/views.py

@@ -340,7 +340,7 @@ def view_battle_group(request, group_id):
         'win_count': win_count,
         'lose_count': lose_count,
         'win_rate': win_rate,
-        'battles': battle_group.battles.order_by('-played_time'),
+        'battles': battle_group.battles.with_prefetch().order_by('-played_time'),
     })
 
 

pyproject.toml

@@ -34,7 +34,7 @@ eventlet = "^0.36.1"
 django-unicorn = "^0.60.0"
 psycopg = { extras = ["binary"], version = "^3.1.13" }
 django-oidc-provider = "^0.8.0"
-openai = "^1.35.3"
+openai = "^1.35.14"
 django-silk = "^5.0.3"
 redis = { extras = ["hiredis"], version = "^5.0.3" }
 ronkyuu = "^0.9"

search/views.py

@@ -15,7 +15,8 @@ def search_for_players_played_with(request, npln_id: str):
         return HttpResponseBadRequest('You cannot search for yourself.')
 
     players = Player.objects.filter(team__battle__uploader_id=request.user.id, npln_id__iexact=npln_id).distinct()
-    battles_with_player = Battle.objects.filter(teams__players__in=players).distinct().order_by('-played_time')
+    battles_with_player = Battle.objects.with_prefetch().filter(teams__players__in=players).distinct().order_by(
+        '-played_time')
 
     return render(request, 'search/search_for_players_played_with.html', {
         'battles': battles_with_player,

users/templates/users/profile.html

@@ -9,7 +9,7 @@
 {% block opengraph_head %}
     <meta property="og:title" content="{{ profile_user.display_name }} (@{{ profile_user.username }})">
 
-    <meta property="og:description" content="Splashcat records battle data for later analysis.">
+    <meta property="og:description" content="Splashcat is an award-winning service that records battle data for later analysis.">
 
     <meta name="twitter:card" content="summary_large_image">
     <meta property="og:image"

users/templates/users/profile_album.html

@@ -9,7 +9,7 @@
 {% block opengraph_head %}
     <meta property="og:title" content="{{ profile_user.display_name }}'s Album'">
 
-    <meta property="og:description" content="Splashcat records battle data for later analysis.">
+    <meta property="og:description" content="Splashcat is an award-winning service that records battle data for later analysis.">
 
     <meta name="twitter:card" content="summary_large_image">
     <meta property="og:image"