Chatbot v2 #9656
Open
Chatbot v2 #9656
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remg
force-pushed
the
chatbot-v2
branch
4 times, most recently
from
87462a0 to
6db1b5b
Compare
Remg
force-pushed
the
chatbot-v2
branch
6 times, most recently
from
860934f to
3edf971
Compare
ottaviano
reviewed
Feb 8, 2024
| @@ -87,6 +87,7 @@ LEGISLATIVES_AVECVOUS_HOST=legislatives.avecvous.code | |||
| RENAISSANCE_HOST=renaissance.code | |||
| APP_RENAISSANCE_HOST=renaissance.code | |||
| WEBHOOK_RENAISSANCE_HOST=webhook.renaissance.code | |||
| WEBHOOK_PROXY_HOST= | |||
There was a problem hiding this comment.
should be in .env.dev file, no?
| retry_strategy: | ||
| max_retries: 10 | ||
| delay: 3000 | ||
| multiplier: 1 |
There was a problem hiding this comment.
this is the default value
Comment on lines
+58
to
+61
| App\Telegram\Webhook\UrlGenerator: ~ | ||
| Tests\App\Telegram\Webhook\ProxyUrlGenerator: | ||
| decorates: App\Telegram\Webhook\UrlGenerator | ||
| arguments: ['@.inner'] |
There was a problem hiding this comment.
Service UrlGenerator will be auto created by main service config and you can decorate it here
Suggested change
| App\Telegram\Webhook\UrlGenerator: ~ | |
| Tests\App\Telegram\Webhook\ProxyUrlGenerator: | |
| decorates: App\Telegram\Webhook\UrlGenerator | |
| arguments: ['@.inner'] | |
| Tests\App\Telegram\Webhook\ProxyUrlGenerator: | |
| decorates: App\Telegram\Webhook\UrlGenerator | |
| arguments: ['@.inner'] |
Comment on lines
+21
to
+31
| public static function fromOpenAI(OpenAIRunStatusEnum $runStatus): self | ||
| { | ||
| return match ($runStatus) { | ||
| OpenAIRunStatusEnum::QUEUED => self::QUEUED, | ||
| OpenAIRunStatusEnum::IN_PROGRESS => self::IN_PROGRESS, | ||
| OpenAIRunStatusEnum::COMPLETED => self::COMPLETED, | ||
| OpenAIRunStatusEnum::CANCELLING, OpenAIRunStatusEnum::CANCELLED => self::CANCELLED, | ||
| OpenAIRunStatusEnum::REQUIRES_ACTION, OpenAIRunStatusEnum::EXPIRED, OpenAIRunStatusEnum::FAILED => self::FAILED, | ||
| default => self::UNKNOWN | ||
| }; | ||
| } |
There was a problem hiding this comment.
what about moving this method into OpenAIRunStatusEnum to avoid to have all mappings in this class?
|
|
||
| public function __construct(string $openAIApiKey) | ||
| { | ||
| $this->openAI = \OpenAI::client($openAIApiKey); |
There was a problem hiding this comment.
what about injecting this like a service in construct ?
Comment on lines
+24
to
+48
| public function handle(Request $request): JsonResponse | ||
| { | ||
| if (!$secret = $request->headers->get(self::SECRET_TOKEN_HEADER)) { | ||
| throw new BadRequestHttpException('The request has no secret token header.'); | ||
| } | ||
|
|
||
| if (!$bot = $this->botProvider->findOneEnabledBySecret($secret)) { | ||
| throw new BadRequestHttpException('No bot found for given secret token.'); | ||
| } | ||
|
|
||
| $this->logger->log($bot, 'Received webhook request.'); | ||
|
|
||
| if (!$content = $request->getContent()) { | ||
| throw new BadRequestHttpException('No content in request'); | ||
| } | ||
|
|
||
| try { | ||
| $data = BotApi::jsonValidate($content, true); | ||
| } catch (InvalidJsonException $e) { | ||
| throw new BadRequestHttpException('The request content is not a valid JSON payload.'); | ||
| } | ||
|
|
||
| try { | ||
| $update = Update::fromResponse($data); | ||
| } catch (InvalidArgumentException $e) { |
There was a problem hiding this comment.
IMO all this stuff can be moved into TelegramBotController because it's too related to the HTTP request. Actually I can't use this handler from Sf Command but I can use UpdateHandler. Wdyt?
Comment on lines
+1484
to
+1488
| chatbot: | ||
| type: | ||
| telegram: Telegram | ||
| assistant_type: | ||
| openai: OpenAI |
There was a problem hiding this comment.
what about making it in two lines ?
chatbot.type.telegram:
chatbot.assistant_type.openai:
it's easier to search when it's in one line
Remg
force-pushed
the
master
branch
4 times, most recently
from
84ca694 to
cd499a6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.