Skip to content

Commit 1ef3c0f

Browse files
committed
fix: replace custom getters/setters with magic methods for session's isRemembered and isSummaryUpToDate
Signed-off-by: Julien Veyssier <[email protected]>
1 parent ff12e78 commit 1ef3c0f

File tree

5 files changed

+11
-23
lines changed

5 files changed

+11
-23
lines changed

lib/Controller/ChattyLLMController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function updateChatSession(int $sessionId, ?string $title = null, ?bool $
219219
$session->setTitle($title);
220220
}
221221
if ($is_remembered !== null) {
222-
$session->setIsRemembered($is_remembered);
222+
$session->setIsRemembered($is_remembered ? 1 : 0);
223223
// schedule summarizer jobs for this chat user
224224
if ($is_remembered) {
225225
$this->sessionSummaryService->scheduleJobsForUser($this->userId);
@@ -824,7 +824,7 @@ public function checkSession(int $sessionId): JSONResponse {
824824
'messageTaskId' => null,
825825
'titleTaskId' => null,
826826
'sessionTitle' => $session->getTitle(),
827-
'is_remembered' => $session->getIsRemembered(),
827+
'is_remembered' => $session->getIsRemembered() !== 0,
828828
'sessionAgencyPendingActions' => $p,
829829
];
830830
if (!empty($messageTasks)) {

lib/Db/ChattyLLM/Session.php

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
* @method \void setAgencyConversationToken(?string $agencyConversationToken)
2626
* @method \string|null getAgencyPendingActions()
2727
* @method \void setAgencyPendingActions(?string $agencyPendingActions)
28+
* @method \int getIsRemembered()
29+
* @method \void setIsRemembered(int $isRemembered)
30+
* @method \int getIsSummaryUpToDate()
31+
* @method \void setIsSummaryUpToDate(int $isSummaryUpToDate)
2832
*/
2933
class Session extends Entity implements \JsonSerializable {
3034
/** @var string */
@@ -100,24 +104,8 @@ public function jsonSerialize() {
100104
'agency_conversation_token' => $this->getAgencyConversationToken(),
101105
'agency_pending_actions' => $this->getAgencyPendingActions(),
102106
'summary' => $this->getSummary(),
103-
'is_summary_up_to_date' => $this->getIsSummaryUpToDate(),
104-
'is_remembered' => $this->getIsRemembered(),
107+
'is_summary_up_to_date' => $this->getIsSummaryUpToDate() !== 0,
108+
'is_remembered' => $this->getIsRemembered() !== 0,
105109
];
106110
}
107-
108-
public function setIsSummaryUpToDate(bool $value): void {
109-
$this->setter('isSummaryUpToDate', [$value ? 1 : 0]);
110-
}
111-
112-
public function setIsRemembered(bool $value): void {
113-
$this->setter('isRemembered', [$value ? 1 : 0]);
114-
}
115-
116-
public function getIsSummaryUpToDate(): bool {
117-
return $this->getter('isSummaryUpToDate') === 1;
118-
}
119-
120-
public function getIsRemembered(): bool {
121-
return $this->getter('isRemembered') === 1;
122-
}
123111
}

lib/Db/ChattyLLM/SessionMapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function deleteSession(string $userId, int $sessionId) {
182182

183183
public function updateSessionIsRemembered(?string $userId, int $sessionId, bool $is_remembered) {
184184
$session = $this->getUserSession($userId, $sessionId);
185-
$session->setIsRemembered($is_remembered);
185+
$session->setIsRemembered($is_remembered ? 1 : 0);
186186
$this->update($session);
187187
}
188188
}

lib/Listener/ChattyLLMTaskListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function handle(Event $event): void {
125125
$session->setAgencyPendingActions($pendingActions);
126126
}
127127
// Set flag that the conversation summary needs to be regenerated
128-
$session->setIsSummaryUpToDate(false);
128+
$session->setIsSummaryUpToDate(0);
129129

130130
$this->sessionMapper->update($session);
131131
}

lib/Service/SessionSummaryService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private function generateSummaries(array $sessions): void {
5757
], 'assistant', $session->getUserId());
5858
$output = $this->taskProcessingService->runTaskProcessingTask($task);
5959
$session->setSummary($output['output']);
60-
$session->setIsSummaryUpToDate(true);
60+
$session->setIsSummaryUpToDate(1);
6161
$this->sessionMapper->update($session);
6262
} catch (\Throwable $e) {
6363
$this->logger->warning('Failed to generate summary for chat session ' . $session->getId(), ['exception' => $e]);

0 commit comments

Comments
 (0)