fix(Assignments): Minor fixes to get things to run

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Db/Assignment.php

@@ -113,19 +113,20 @@ public function setRecurrence(string $recurrence): void {
 	public function isDueToRun(\DateTimeImmutable $now): bool {
 		try {
 			$startsAt = new \DateTime('@' . $this->getStartsAt());
+			$lastRunAt = new \DateTime('@' . $this->getLastRunAt());
 			// Find recurrences after the last run or after the current time if this assignment has never run
 			$rule = new Rule($this->getRecurrence(), $startsAt);
 			$transformer = new \Recurr\Transformer\ArrayTransformer();
-			$constraint = new AfterConstraint($this->getLastRunAt() !== 0 ? new \DateTime('@' . $this->getLastRunAt()) : $startsAt, true);
+			$constraint = new AfterConstraint($this->getLastRunAt() !== 0 ? $lastRunAt : $startsAt, false);
 			/** @var RecurrenceCollection $collection */
 			$collection = $transformer->transform($rule, $constraint);
 			if ($collection->isEmpty()) {
 				return false;
 			}
 			$nextRecurrence = $collection->first();
-			if ($nextRecurrence->getStart()->getTimestamp() <= $now->getTimestamp() && $nextRecurrence->getStart()->getTimestamp() > $this->getLastRunAt()) {
-				return true;
-			}
+			$isDue = $nextRecurrence->getStart()->getTimestamp() <= $now->getTimestamp() && $nextRecurrence->getStart()->getTimestamp() > $this->getLastRunAt();
+			\OCP\Log\logger('assistant')->error('Next recurrence of assignment ' . $this->getId().' of user ' . $this->getUserId() . ': ' . $nextRecurrence->getStart()->format('Y-m-d H:i:s') . ' - isDue: ' . ($isDue ? 'true' : 'false'));
+			return $isDue;
 		} catch (InvalidRRule|\Exception|NotFoundExceptionInterface|ContainerExceptionInterface $e) {
 			// this should not happen, as we validate the rule on setRecurrence, but just in case, we catch the exception and log it
 			logger('assistant')->error($e->getMessage(), ['exception' => $e]);

lib/Db/ChattyLLM/Message.php

@@ -31,6 +31,8 @@
 class Message extends Entity implements \JsonSerializable {
 	public const ROLE_HUMAN = 'human';
 
+	public const ROLE_ASSISTANT = 'assistant';
+
 	/** @var int */
 	protected $sessionId;
 	/** @var string */

lib/Listener/ChattyLLMTaskListener.php

@@ -70,7 +70,7 @@ public function handle(Event $event): void {
 			$message = new Message();
 			$message->setSessionId($sessionId);
 			$message->setOcpTaskId($task->getId());
-			$message->setRole('assistant');
+			$message->setRole(Message::ROLE_ASSISTANT);
 			$message->setTimestamp(time());
 			$sources = json_encode($taskOutput['sources'] ?? []);
 			$message->setSources($sources ?: '[]');

lib/Service/AssignmentsService.php

@@ -19,6 +19,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\DB\Exception;
+use OCP\IL10N;
 use Psr\Log\LoggerInterface;
 
 class AssignmentsService {
@@ -29,6 +30,7 @@ public function __construct(
 		private ITimeFactory $timeFactory,
 		private LoggerInterface $logger,
 		private IJobList $jobList,
+		private IL10N $l10n,
 	) {
 	}
 
@@ -98,10 +100,25 @@ public function scheduleAssignmentRun(?string $userId, int $assignmentId): void
 				throw new InternalException(previous: $e);
 			}
 			$assignment = $this->assignmentMapper->find($userId, $assignmentId);
+			$assignment->setLastRunAt($this->timeFactory->now()->getTimestamp());
+			$this->assignmentMapper->update($assignment);
 			$this->chatService->createMessage($userId, $session->getId(), Message::ROLE_HUMAN, $assignment->getPrompt(), $this->timeFactory->now()->getTimestamp());
-			$this->chatService->scheduleMessageGeneration($userId, $session->getId());
+			$this->chatService->scheduleAssignmentMessageGeneration($userId, $session->getId());
 		} catch (BadRequestException|InternalException|DoesNotExistException|MultipleObjectsReturnedException|Exception $e) {
 			$this->logger->error('Error while running assignment ' . $assignment->getId() . ' for user ' . $userId, ['exception' => $e]);
+			if (isset($session)) {
+				try {
+					$this->chatService->createMessage(
+						$userId,
+						$session->getId(),
+						message::ROLE_ASSISTANT,
+						$this->l10n->t('An error occurred while scheduling this assignment run. Reach out to your system administrator if this issue persists.'),
+						$this->timeFactory->now()->getTimestamp()
+					);
+				} catch (BadRequestException|InternalException|NotFoundException|UnauthorizedException $e) {
+					$this->logger->error('Error while creating error message for assignment ' . $assignment->getId() . ' for user ' . $userId, ['exception' => $e]);
+				}
+			}
 		} catch (NotFoundException $e) {
 			try {
 				$this->assignmentMapper->delete($assignment);

lib/Service/ChatService.php

@@ -421,6 +421,54 @@ public function scheduleMessageGeneration(?string $userId, int $sessionId, int $
 		return $taskId;
 	}
 
+	/**
+	 * @throws InternalException
+	 * @throws BadRequestException
+	 * @throws NotFoundException
+	 * @throws UnauthorizedException
+	 */
+	public function scheduleAssignmentMessageGeneration(?string $userId, int $sessionId): int {
+		if ($userId === null) {
+			throw new UnauthorizedException($this->l10n->t('Unauthorized'));
+		}
+		try {
+			$sessionExists = $this->sessionMapper->exists($userId, $sessionId);
+		} catch (Exception $e) {
+			throw new InternalException(previous: $e);
+		}
+		if (!$sessionExists) {
+			throw new NotFoundException($this->l10n->t('Session not found'));
+		}
+
+		if (!$this->isContextAgentAvailable()) {
+			throw new BadRequestException('context_agent_not_available');
+		}
+		try {
+			$lastUserMessage = $this->messageMapper->getLastHumanMessage($sessionId);
+		} catch (DoesNotExistException $e) {
+			throw new NotFoundException($this->l10n->t('No user message found in this session'), previous: $e);
+		} catch (MultipleObjectsReturnedException|Exception $e) {
+			throw new InternalException(previous: $e);
+		}
+
+
+		try {
+			$session = $this->sessionMapper->getUserSession($userId, $sessionId);
+		} catch (DoesNotExistException $e) {
+			throw new NotFoundException($this->l10n->t('Session not found'), previous: $e);
+		} catch (MultipleObjectsReturnedException|Exception $e) {
+			throw new InternalException(previous: $e);
+		}
+		// We reset the context for each interaction, because this is an assignment,
+		// the assistant does not remember things between assignment runs
+		$lastConversationToken = '{}';
+
+		// classic agency
+		$prompt = $lastUserMessage->getContent();
+		$taskId = $this->scheduleAgencyTask($userId, $prompt, 0, $lastConversationToken, $sessionId);
+		return $taskId;
+	}
+
 	/**
 	 * @throws BadRequestException
 	 * @throws InternalException
@@ -494,7 +542,7 @@ private function getAudioHistory(array $history): array {
 				'role' => $message->getRole(),
 			];
 			$attachments = $message->jsonSerialize()['attachments'];
-			if ($message->getRole() === 'assistant'
+			if ($message->getRole() === Message::ROLE_ASSISTANT
 				&& count($attachments) > 0
 				&& $attachments[0]['type'] === 'Audio'
 				&& isset($attachments[0]['remote_audio_id'])