Skip to content

Commit c5aa2e8

Browse files
kaiokenkaioken
authored
Merge pull request #3694 from bakaphp/development
Version 1.36.1
2 parents 3cdc968 + 2931c44 commit c5aa2e8

File tree

18 files changed

+727
-108
lines changed

18 files changed

+727
-108
lines changed

‎.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"cSpell.words": [
33
"hashtable",
44
"indice",
5+
"INTELLICHECK",
56
"Logix",
67
"Meili",
78
"Metafield",

‎app/Console/Commands/Connectors/PromptMine/FixPromptDataCommand.php

+60-30
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ private function SyncPromptData(Apps $app, MessageType $messageType, MessageType
7676

7777
//Need to get just the first child message
7878
foreach ($message->children as $childMessage) {
79-
$validateMessageSchema = new MessageSchemaValidator($childMessage, $childMessageType, true);
80-
$this->info('--Checking Child Nugget Message Schema of ID: ' . $childMessage->getId());
81-
if ($validateMessageSchema->validate()) {
82-
$this->info('--Message Schema is OK');
83-
continue;
84-
}
79+
// $validateMessageSchema = new MessageSchemaValidator($childMessage, $childMessageType, true);
80+
// $this->info('--Checking Child Nugget Message Schema of ID: ' . $childMessage->getId());
81+
// if ($validateMessageSchema->validate()) {
82+
// $this->info('--Message Schema is OK');
83+
// continue;
84+
// }
8585

8686
$this->info('--Fixing Child Nugget Message Schema');
8787
$this->fixNuggetData($childMessage);
@@ -97,13 +97,13 @@ private function SyncPromptData(Apps $app, MessageType $messageType, MessageType
9797
private function fixPromptData(Message $message): void
9898
{
9999
$messageData = is_array($message->message) ? $message->message : json_decode($message->message, true);
100-
$validateMessageSchema = new MessageSchemaValidator($message, MessageType::find($message->message_types_id), true);
100+
// $validateMessageSchema = new MessageSchemaValidator($message, MessageType::find($message->message_types_id), true);
101101

102-
$this->info('--Checking Prompt Message Schema of ID: ' . $message->getId());
103-
if ($validateMessageSchema->validate()) {
104-
$this->info('-Prompt Message Schema is OK');
105-
return;
106-
}
102+
// $this->info('--Checking Prompt Message Schema of ID: ' . $message->getId());
103+
// if ($validateMessageSchema->validate()) {
104+
// $this->info('-Prompt Message Schema is OK');
105+
// return;
106+
// }
107107
//Anything that is not a prompt, set as deleted
108108
if (! isset($messageData['prompt'])) {
109109
$message->is_deleted = 1;
@@ -157,10 +157,20 @@ private function fixPromptData(Message $message): void
157157
$this->info('Added payment to message data');
158158
}
159159

160-
// if (isset($messageData['ai_nugged'])) {
161-
// unset($messageData['ai_nugged']);
162-
// $this->info('Removed ai_nugged from message data');
163-
// }
160+
if (isset($messageData['ai_nugged'])) {
161+
unset($messageData['ai_nugged']);
162+
$this->info('Removed ai_nugged from message data');
163+
}
164+
165+
if (isset($messageData['nugget'])) {
166+
unset($messageData['nugget']);
167+
$this->info('Removed nugget from message data');
168+
}
169+
170+
if (isset($messageData['is_assistant'])) {
171+
unset($messageData['is_assistant']);
172+
$this->info('Removed is_assistant from message data');
173+
}
164174

165175
$message->message = $messageData;
166176
$message->save();
@@ -200,18 +210,22 @@ private function fixNuggetData(Message $message): void
200210
if (! isset($messageData['type']) && isset($parentMessageData['type'])) {
201211
$messageData['type'] = $parentMessageData['type'];
202212

203-
if (! isset($messageData['nugget']) || ! isset($messageData['image'])) {
213+
$this->info('Added message type to message data: ' . $messageData['type']);
214+
if (! isset($messageData['nugget']) && $messageData['type'] === 'text-format') {
215+
$this->info('Generating nugget for message ID: ' . $message->getId());
204216
$response = Prism::text()
205-
->using(Provider::Gemini, 'gemini-2.0-flash')
206-
->withPrompt($parentMessageData['prompt'])
207-
->generate();
208-
217+
->using(Provider::Gemini, 'gemini-2.0-flash')
218+
->withPrompt($parentMessageData['prompt'])
219+
->generate();
209220
$responseText = str_replace(['```', 'json'], '', $response->text);
210221
$messageData['nugget'] = $responseText;
222+
$this->info('Added message nugget to message data');
211223
}
224+
}
212225

213-
$this->info('Added message type to message data: ' . $messageData['type']);
214-
$this->info('Added message nugget to message data');
226+
if (isset($messageData['nugget']) && $messageData['type'] === 'image-format') {
227+
unset($messageData['nugget']);
228+
$this->info('Removed nugget from message data on image format');
215229
}
216230

217231
if (isset($messageData['display_type'])) {
@@ -244,10 +258,15 @@ private function fixNuggetData(Message $message): void
244258
$this->info('Removed ai_model from message data');
245259
}
246260

247-
// if (isset($messageData['ai_nugged'])) {
248-
// unset($messageData['ai_nugged']);
249-
// $this->info('Removed ai_nugged from message data');
250-
// }
261+
if (isset($messageData['ai_nugged'])) {
262+
unset($messageData['ai_nugged']);
263+
$this->info('Removed ai_nugged from message data');
264+
}
265+
266+
if (isset($messageData['description'])) {
267+
unset($messageData['description']);
268+
$this->info('Removed description from message data');
269+
}
251270

252271
$message->message = $messageData;
253272
$message->save();
@@ -257,9 +276,9 @@ private function createNuggetMessage(Message $parentMessage, MessageType $childM
257276
{
258277
$messageData = is_array($parentMessage->message) ? $parentMessage->message : json_decode($parentMessage->message, true);
259278
$response = Prism::text()
260-
->using(Provider::Gemini, 'gemini-2.0-flash')
261-
->withPrompt($messageData['prompt'])
262-
->generate();
279+
->using(Provider::Gemini, 'gemini-2.0-flash')
280+
->withPrompt($messageData['prompt'])
281+
->generate();
263282

264283
$responseText = str_replace(['```', 'json'], '', $response->text);
265284
$nuggetId = DB::connection('social')->table('messages')->insertGetId([
@@ -282,6 +301,17 @@ private function createNuggetMessage(Message $parentMessage, MessageType $childM
282301
->where('id', $nuggetId)
283302
->update(['path' => $parentMessage->getId() . "." . $nuggetId]);
284303

304+
foreach ($parentMessage->tags() as $tag) {
305+
DB::connection('social')->table('tags_entities')->insert([
306+
'entity_id' => $nuggetId,
307+
'tags_id' => $tag->getId(),
308+
'users_id' => $parentMessage->users_id,
309+
'taggable_type' => "Kanvas\Social\Messages\Models\Message",
310+
'created_at' => date('Y-m-d H:i:s'),
311+
'updated_at' => date('Y-m-d H:i:s'),
312+
]);
313+
}
314+
285315
//Call fixNuggetData just in case something is missing
286316
$this->fixNuggetData(Message::find($nuggetId));
287317

‎app/Console/Commands/Workflows/KanvasWorkflowSynActionCommand.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Kanvas\Connectors\Google\Activities\SyncMessageToDocumentActivity;
2020
use Kanvas\Connectors\Google\Activities\SyncUserInteractionToEventActivity;
2121
use Kanvas\Connectors\InAppPurchase\Workflows\LinkMessageToOrderActivity;
22+
use Kanvas\Connectors\Intellicheck\Activities\IdVerificationReportActivity;
2223
use Kanvas\Connectors\Internal\Activities\ExtractCompanyNameFromPeopleEmailActivity;
2324
use Kanvas\Connectors\Internal\Activities\GenerateCompanyDashboardActivity;
2425
use Kanvas\Connectors\Internal\Activities\GenerateMessageSlugActivity;
@@ -151,6 +152,7 @@ public function handle(): void
151152
UpdateOrderStripePaymentActivity::class,
152153
AttachFileToChecklistItemActivity::class,
153154
PromptImageFilterActivity::class,
155+
IdVerificationReportActivity::class,
154156
];
155157

156158
$createdActions = [];

‎app/GraphQL/Workflow/Mutations/Workflows/WorkflowMutationManagement.php

-9
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ public function runWorkflowFromEntity(mixed $rootValue, array $request): mixed
6363
return $results->output();
6464
}
6565

66-
/**
67-
* @todo this is a temporary solution to return the report
68-
*/
69-
if ($workflowAction == 'after-id-verification') {
70-
return [
71-
'report' => 'passed',
72-
];
73-
}
74-
7566
return ['success' => true];
7667
}
7768
}

0 commit comments

Comments
 (0)