215 - feat: discord integration - part 1 #217

MAbdurrehman1 · 2024-08-02T23:35:39Z

Closes #215

Notes

OpenAIClient relies on Response Format value of the prompt, therefore set it to json for the prompts that require machine readable results. At the moment they are github-pr-assessment and manual-assessment
discord_user_id and discord_username is implemented only on database level and Django admin. Leaving API support for this field as follow up work
Image generation requests are no longer tracked with PromptLayer because of the changes in promptlayer library
"Each /ia command will cost 1 TNB" requirement is not implemented and left as follow up work
"Set up the TNB charging system for each command" requirement is not implemented and left as follow up work
"Develop error handling for unmet requirements" is implemented partially, the rest is left as follow up work
"Future Improvements" are not implemented

* Upgrade PromptLayer and switch to .run() method * Simplify code * Cleaning * Removing old OpenAI client interface * Update message format * Cleaning * Cleaning

buckyroberts · 2024-08-04T18:24:03Z

thenewboston/discord/utils/bot.py

+                return  # Ignore messages from the bot itself
+
+            User = get_user_model()
+            user = await sync_to_async(User.objects.get)(id=1)


Need to fix this (id=1)

dmugtasimov

Added comments. Maybe I should work on some of them myself. Two major issue I see:

Keep OpenAIClient since it is a good pattern to use (it encapsulates integration logic)
Add unittests for the changes made

dmugtasimov · 2024-08-05T13:40:57Z

thenewboston/art/views/openai_image.py

-OpenAI = promptlayer.openai.OpenAI
+promptlayer_client = PromptLayer(api_key=settings.PROMPTLAYER_API_KEY)
+OpenAI = promptlayer_client.openai.OpenAI
+client = OpenAI()


is client = OpenAI() used anywhere?

dmugtasimov · 2024-08-05T13:43:18Z

thenewboston/contributions/models/contribution.py

 from thenewboston.general.models import CreatedModified
 from thenewboston.general.utils.transfers import change_wallet_balance

+promptlayer_client = PromptLayer(api_key=settings.PROMPTLAYER_API_KEY)


Let's not create objects on module import. Promptplayer did a good thing deglobalizing the configuration of the client. Now we can move PromptLayer(api_key=settings.PROMPTLAYER_API_KEY) creation into OpenAIClient

I can work on refactoring it if you want

dmugtasimov · 2024-08-05T13:44:12Z

thenewboston/art/views/openai_image.py

@@ -13,8 +12,9 @@

 from ..serializers.openai_image import OpenAIImageSerializer

-promptlayer.api_key = settings.PROMPTLAYER_API_KEY
-OpenAI = promptlayer.openai.OpenAI
+promptlayer_client = PromptLayer(api_key=settings.PROMPTLAYER_API_KEY)


Let's not create objects on module import

dmugtasimov · 2024-08-05T13:45:57Z

thenewboston/contributions/models/contribution.py

@@ -69,15 +72,21 @@ def assess(self, save=True):
                assessment_points = pull.assessment_points
                assessment_explanation = pull.assessment_explanation
            case ContributionType.MANUAL.value:
-                result = OpenAIClient.get_instance().get_chat_completion(
-                    settings.GITHUB_MANUAL_CONTRIBUTION_ASSESSMENT_TEMPLATE_NAME,
+                response = promptlayer_client.run(


Let's keep the logic inside OpenAIClient. So there is just one point of integration to deal with

dmugtasimov · 2024-08-05T13:46:23Z

thenewboston/discord/admin.py

let's not have this empty file

dmugtasimov · 2024-08-05T13:48:15Z

thenewboston/discord/tests.py

let's not have this empty file

dmugtasimov · 2024-08-05T13:50:10Z

thenewboston/discord/utils/bot.py

would rather have it in thenewboston/discord/client.py or thenewboston/general/clients/discord.py

dmugtasimov · 2024-08-05T13:51:08Z

thenewboston/discord/views.py

let's not have this empty file

dmugtasimov · 2024-08-05T13:52:07Z

thenewboston/general/management/commands/openai.py

@@ -1,50 +0,0 @@
-import json


Let's not delete this. It is very useful for testing and debugging.

dmugtasimov · 2024-08-05T13:54:44Z

thenewboston/general/clients/openai.py

-    return response.choices[0].message.content
-
-
-class OpenAIClient:


Let's keep dedicated wrapper class client approach. This is very convenient for integration purposes, since you always know the integration point and we to place common conversion logic (between more general interface of official client and what we actually need for our app). It encapsulates integration logic

dmugtasimov · 2024-08-05T14:03:29Z

Also unitests are failing

sentry-io · 2024-08-07T15:49:17Z

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

‼️ Exception: PromptLayer had the following error while getting your prompt template: tasks.sync_contributions View Issue
‼️ BadRequestError: Error code: 400 - {'type': 'error', 'error': {'type': 'invalid_request_error', 'message': 'messag... thenewboston.general.clients.llm in get_chat_co... View Issue

_{Did you find this useful? React with a 👍 or 👎}

MAbdurrehman1 requested review from dmugtasimov and buckyroberts and removed request for dmugtasimov August 2, 2024 23:36

MAbdurrehman1 added 2 commits August 3, 2024 05:01

215 - feat: discord integration - part 1

6e796c1

running the bot asynchronously in a separate thread

a52ebbc

MAbdurrehman1 force-pushed the 215-discord-integration branch from f9302a1 to a52ebbc Compare August 3, 2024 00:02

MAbdurrehman1 and others added 2 commits August 3, 2024 05:09

print replaced with logger

bec03fb

Upgrade PromptLayer and switch to .run() method (#219)

9653668

* Upgrade PromptLayer and switch to .run() method * Simplify code * Cleaning * Removing old OpenAI client interface * Update message format * Cleaning * Cleaning

buckyroberts reviewed Aug 4, 2024

View reviewed changes

dmugtasimov requested changes Aug 5, 2024

View reviewed changes

dmugtasimov added do not merge work in progress labels Aug 5, 2024

dmugtasimov force-pushed the 215-discord-integration branch 13 times, most recently from cbd0012 to 7bab5dc Compare August 6, 2024 22:36

Improvements to Discord integration

b6b9cbb

dmugtasimov force-pushed the 215-discord-integration branch from 7bab5dc to b6b9cbb Compare August 6, 2024 22:54

dmugtasimov requested a review from buckyroberts August 6, 2024 22:55

dmugtasimov approved these changes Aug 6, 2024

View reviewed changes

buckyroberts approved these changes Aug 6, 2024

View reviewed changes

buckyroberts and others added 4 commits August 6, 2024 19:18

Update input variable name

12d8932

Include historical messages

75b9491

Updates

e7cf0c0

Small refactorings

86bd1b4

dmugtasimov force-pushed the 215-discord-integration branch from 13e18b3 to 86bd1b4 Compare August 7, 2024 14:34

dmugtasimov removed do not merge work in progress labels Aug 7, 2024

dmugtasimov merged commit d37b813 into master Aug 7, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

215 - feat: discord integration - part 1 #217

215 - feat: discord integration - part 1 #217

MAbdurrehman1 commented Aug 2, 2024 •

edited by dmugtasimov

Loading

buckyroberts Aug 4, 2024

dmugtasimov left a comment

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov Aug 5, 2024

dmugtasimov commented Aug 5, 2024

sentry-io bot commented Aug 7, 2024 •

edited

Loading

		return response.choices[0].message.content


		class OpenAIClient:

215 - feat: discord integration - part 1 #217

215 - feat: discord integration - part 1 #217

Conversation

MAbdurrehman1 commented Aug 2, 2024 • edited by dmugtasimov Loading

Notes

Choose a reason for hiding this comment

dmugtasimov left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dmugtasimov commented Aug 5, 2024

sentry-io bot commented Aug 7, 2024 • edited Loading

Suspect Issues

MAbdurrehman1 commented Aug 2, 2024 •

edited by dmugtasimov

Loading

sentry-io bot commented Aug 7, 2024 •

edited

Loading