-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[stable27] Bump version + fix 32 bit tests #39775
Closed
Closed
Changes from all commits
Commits
Show all changes
103 commits
Select commit
Hold shift + click to select a range
2e9dea2
Initial work on lm OCP API
marcelklehr 457f1eb
LLM OCP API: Rework to use Task objects
marcelklehr d20ee42
LLM OCP API: Implement private backend code + add ILanguageModelTask
marcelklehr 7031072
LLM OCP API: Add db migration
marcelklehr ed3672a
LLM OCP API: Add to RegistrationContext
marcelklehr 33f3379
Fix Copyright
marcelklehr 5807c43
LLM OCP API: ADd topics and headline tasks
marcelklehr 236c32b
LLM OCP API: Implement ocs API
marcelklehr 76a5db8
LLM OCP API: cs:fix
marcelklehr 01db2cf
LLM OCP API: Make linters happy
marcelklehr dbd9420
LLM OCP API: Fix type errors
marcelklehr 0024f0d
LLM OCP API: Add @since
marcelklehr 02c78be
LLM OCP API: Fix static analysis
marcelklehr 612af73
LLM OCP API: cs:fix
marcelklehr dd7eafa
LLM OCP API: Fix coding style and psalm
marcelklehr 6320c68
Update lib/public/LanguageModel/ITopicsProvider.php
marcelklehr ecda18b
LLM OCP API: Add task definitions
marcelklehr 1ac86d2
LLM OCP API: Commit autoloaders
marcelklehr 4e3ca11
Update lib/public/AppFramework/Bootstrap/IRegistrationContext.php
marcelklehr 4405027
Apply suggestions from code review
marcelklehr c8bbe8f
LLM OCP API: Type shenanigans for Visitor pattern
marcelklehr ddeaaea
LLM OCP API: strict types and copyright
marcelklehr d203e3a
OCP: Introduce OCP\Common\Exception\NotFoundException
marcelklehr fb9262e
LLM OCP API: Use OCP\Common\Exception\NotFoundException
marcelklehr e90dd4a
LLM OCP API: Fix copyright
marcelklehr 44ce285
cs:fix
marcelklehr 91325ef
Add tasks::last_updated column and vacate tasks after a week
marcelklehr 2234497
TaskMapper#update: Use time factory
marcelklehr 970d688
ILanguageModelManager: Add docblock description
marcelklehr c1085bf
ILanguageModelTask: Use php type checking along with psalm parameteri…
marcelklehr a462750
Add preliminary tests
marcelklehr d21f7bf
Fix tests
marcelklehr e717959
Make tests pass
marcelklehr 09a8541
Add test for task cleanup
marcelklehr 8197403
Fix LanguageModelManager#runTask: Insert task into db if it doesn't e…
marcelklehr 4447d59
cs:fix
marcelklehr 97a4a06
Apply suggestions from code review
marcelklehr ffedceb
LLM OCP API: Add identifier param
marcelklehr 8f0618d
LLM OCP API: Fix psalm error
marcelklehr 445b72a
LLM OCP API: Fix security issue
marcelklehr 7320011
LLM OCP API: Fix psam errors
marcelklehr d9f2aaf
LLM OCP API: Fix psam error
marcelklehr 8567315
LLM OCS API: s/tasks/tasktypes/
marcelklehr e312b2b
LLM OCS API: Add OpenAPI docs
marcelklehr 22a93bf
Apply suggestions from code review
marcelklehr 7a423e4
Update lib/public/LanguageModel/ILanguageModelProvider.php
marcelklehr 9a36bb4
Update lib/public/LanguageModel/Events/TaskFailedEvent.php
marcelklehr b0cb5a4
LLM Migration: Return null if nothing changed
marcelklehr 3350811
LLM OCP API: Add missing copyright and strict types
marcelklehr 70e65ff
LLM OCP API: s/getAvailableTasks/getAvailableTaskClasses/
marcelklehr 39bc710
LLM OCP API: Simplify LanguageModelManager#canHandleTask
marcelklehr ddb2726
LLM OCP API: Don't lose trace of wrapped exceptions
marcelklehr 4ce77b9
LLM OCP API: Explain TaskBackgroundJob#setAllowParallelRuns
marcelklehr d578974
LLM OCP API: Simplify TaskBackgroundJob#run catch block
marcelklehr 413a4f6
OCP\Common\NotFoundException: Add param type
marcelklehr 5e86054
LLM OCP API: Avoid using OC in OCP
marcelklehr 17351b6
LLM OCP API: Fix psalm issues
marcelklehr 39d59a1
LLM OCP API: Fix OpenApi docs
marcelklehr 15f08a7
LLM OCP API: Improve scheduleTask docblock
marcelklehr 6b2687e
LLM OCP API: Change Tests to use EventDispatcher mock
marcelklehr a39e3c9
cs:fix
marcelklehr 1ad0a29
LanguageModelApiController: Use jsonSerialize method to help psalm
marcelklehr 8acb1dc
Since 27.1.0
marcelklehr fbd178a
Update core/Controller/LanguageModelApiController.php
marcelklehr 6f5119c
Fix openapi docs
marcelklehr 5d975b9
Update core/Controller/LanguageModelApiController.php
marcelklehr 696a45d
Update core/Controller/LanguageModelApiController.php
marcelklehr cf2c42a
Massive refactoring: Turn LanguageModel OCP API into TextProcessing API
marcelklehr d8c44da
Fix psalm errors
marcelklehr 87ac995
Fix psalm errors
marcelklehr 322bb97
Apply suggestions from code review
marcelklehr 4118baa
Update autoloaders
marcelklehr 2d296ce
cs:fix
marcelklehr 96ec6ff
Fix psalm errors
marcelklehr 00e3fb1
Remove Task::factory method
marcelklehr cac5171
Fix tests: Adjust constructor signature
marcelklehr ad645c9
Fix tests: Adjust constructor signature
marcelklehr cc5818f
First pass at ai admin settings
marcelklehr 43926a2
AI Admin settings: Implement mt settings, stt settings and tp settings
marcelklehr d4b2012
fix(TextProcessing): Inject L10N\IFactory instead of IL10N
marcelklehr 674fd35
AI admin settings: Add save mechanism
marcelklehr 7fd0b1b
AI admin settings: Use config values in AI feature managers
marcelklehr 850a92e
AI admin settings: Add a draggable icon in UI for translation provide…
marcelklehr 40d4da1
AI admin settings: Update composer autoloaders
marcelklehr 6c8c047
AI admin settings: strict_types
marcelklehr 832e0d3
AI admin settings: cs:fix
marcelklehr 8507112
AI admin settings: lint:fix
marcelklehr 9e6a864
AI admin settings: lint:fix
marcelklehr 4b97ec7
AI admin settings: lint:fix
marcelklehr 50adc8c
Migration: Drop llm_tasks table and add textprocessing_tasks
marcelklehr f4160e0
Fix typo
marcelklehr d13ceb3
Update apps/settings/src/components/AdminAI.vue
marcelklehr dbcfef1
Update apps/settings/src/components/AdminAI.vue
marcelklehr 3d9a588
Admin AI settings: Improve a11y of machine translation precendence
marcelklehr 8dee7d0
Admin AI settings: Use ContainerInterface instead of IServerContainer
marcelklehr 52a1748
move long click handlers into methods
julien-nc f95cf63
use DB type constants
julien-nc 67fa798
polish AI admin settings UI
julien-nc 0029171
fix wrong NcSelect event in AI admin settings
julien-nc 2d9a064
fix composer autoload files
julien-nc 4bae251
fix: missing argument for TextProcessing Manager
kesselb 41918cc
Fix TextProcessing test for 32bit
marcelklehr 08cd220
Update version.php to 27.1
marcelklehr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* @copyright Copyright (c) 2023 Marcel Klehr <[email protected]> | ||
* | ||
* @license AGPL-3.0 | ||
* | ||
* This code is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License, version 3, | ||
* as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License, version 3, | ||
* along with this program. If not, see <http://www.gnu.org/licenses/> | ||
* | ||
*/ | ||
namespace OCA\Settings\Controller; | ||
|
||
use OCP\AppFramework\Controller; | ||
use OCP\AppFramework\Http; | ||
use OCP\AppFramework\Http\DataResponse; | ||
use OCP\IConfig; | ||
use OCP\IL10N; | ||
use OCP\IRequest; | ||
use OCP\IURLGenerator; | ||
use OCP\IUserSession; | ||
use OCP\Mail\IMailer; | ||
use function GuzzleHttp\Promise\queue; | ||
|
||
class AISettingsController extends Controller { | ||
|
||
/** | ||
* @param string $appName | ||
* @param IRequest $request | ||
* @param IConfig $config | ||
*/ | ||
public function __construct( | ||
$appName, | ||
IRequest $request, | ||
private IConfig $config, | ||
) { | ||
parent::__construct($appName, $request); | ||
} | ||
|
||
/** | ||
* Sets the email settings | ||
* | ||
* @AuthorizedAdminSetting(settings=OCA\Settings\Settings\Admin\ArtificialIntelligence) | ||
* | ||
* @param array $settings | ||
* @return DataResponse | ||
*/ | ||
public function update($settings) { | ||
$keys = ['ai.stt_provider', 'ai.textprocessing_provider_preferences', 'ai.translation_provider_preferences']; | ||
foreach ($keys as $key) { | ||
if (!isset($settings[$key])) { | ||
continue; | ||
} | ||
$this->config->setAppValue('core', $key, json_encode($settings[$key])); | ||
} | ||
|
||
return new DataResponse(); | ||
} | ||
} |
58 changes: 58 additions & 0 deletions
58
apps/settings/lib/Sections/Admin/ArtificialIntelligence.php
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* @copyright Copyright (c) 2023 Marcel Klehr <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
namespace OCA\Settings\Sections\Admin; | ||
|
||
use OCP\IL10N; | ||
use OCP\IURLGenerator; | ||
use OCP\Settings\IIconSection; | ||
|
||
class ArtificialIntelligence implements IIconSection { | ||
|
||
/** @var IL10N */ | ||
private $l; | ||
|
||
/** @var IURLGenerator */ | ||
private $urlGenerator; | ||
|
||
public function __construct(IL10N $l, IURLGenerator $urlGenerator) { | ||
$this->l = $l; | ||
$this->urlGenerator = $urlGenerator; | ||
} | ||
|
||
public function getIcon(): string { | ||
return $this->urlGenerator->imagePath('settings', 'ai.svg'); | ||
} | ||
|
||
public function getID(): string { | ||
return 'ai'; | ||
} | ||
|
||
public function getName(): string { | ||
return $this->l->t('Artificial Intelligence'); | ||
} | ||
|
||
public function getPriority(): int { | ||
return 40; | ||
} | ||
} |
166 changes: 166 additions & 0 deletions
166
apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* @copyright Copyright (c) 2023 Marcel Klehr <[email protected]> | ||
* | ||
* @author Marcel Klehr <[email protected]> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
namespace OCA\Settings\Settings\Admin; | ||
|
||
use OCP\AppFramework\Http\TemplateResponse; | ||
use OCP\AppFramework\Services\IInitialState; | ||
use OCP\IConfig; | ||
use OCP\IL10N; | ||
use OCP\Settings\IDelegatedSettings; | ||
use OCP\SpeechToText\ISpeechToTextManager; | ||
use OCP\TextProcessing\IManager; | ||
use OCP\TextProcessing\IProvider; | ||
use OCP\TextProcessing\ITaskType; | ||
use OCP\Translation\ITranslationManager; | ||
use Psr\Container\ContainerExceptionInterface; | ||
use Psr\Container\ContainerInterface; | ||
use Psr\Container\NotFoundExceptionInterface; | ||
|
||
class ArtificialIntelligence implements IDelegatedSettings { | ||
public function __construct( | ||
private IConfig $config, | ||
private IL10N $l, | ||
private IInitialState $initialState, | ||
private ITranslationManager $translationManager, | ||
private ISpeechToTextManager $sttManager, | ||
private IManager $textProcessingManager, | ||
private ContainerInterface $container, | ||
) { | ||
} | ||
|
||
/** | ||
* @return TemplateResponse | ||
*/ | ||
public function getForm() { | ||
$translationProviders = []; | ||
$translationPreferences = []; | ||
foreach ($this->translationManager->getProviders() as $provider) { | ||
$translationProviders[] = [ | ||
'class' => $provider::class, | ||
'name' => $provider->getName(), | ||
]; | ||
$translationPreferences[] = $provider::class; | ||
} | ||
|
||
$sttProviders = []; | ||
foreach ($this->sttManager->getProviders() as $provider) { | ||
$sttProviders[] = [ | ||
'class' => $provider::class, | ||
'name' => $provider->getName(), | ||
]; | ||
} | ||
|
||
$textProcessingProviders = []; | ||
/** @var array<class-string<ITaskType>, class-string<IProvider>> $textProcessingSettings */ | ||
$textProcessingSettings = []; | ||
foreach ($this->textProcessingManager->getProviders() as $provider) { | ||
$textProcessingProviders[] = [ | ||
'class' => $provider::class, | ||
'name' => $provider->getName(), | ||
'taskType' => $provider->getTaskType(), | ||
]; | ||
$textProcessingSettings[$provider->getTaskType()] = $provider::class; | ||
} | ||
$textProcessingTaskTypes = []; | ||
foreach ($textProcessingSettings as $taskTypeClass => $providerClass) { | ||
/** @var ITaskType $taskType */ | ||
try { | ||
$taskType = $this->container->get($taskTypeClass); | ||
} catch (NotFoundExceptionInterface $e) { | ||
continue; | ||
} catch (ContainerExceptionInterface $e) { | ||
continue; | ||
} | ||
$textProcessingTaskTypes[] = [ | ||
'class' => $taskTypeClass, | ||
'name' => $taskType->getName(), | ||
'description' => $taskType->getDescription(), | ||
]; | ||
} | ||
|
||
$this->initialState->provideInitialState('ai-stt-providers', $sttProviders); | ||
$this->initialState->provideInitialState('ai-translation-providers', $translationProviders); | ||
$this->initialState->provideInitialState('ai-text-processing-providers', $textProcessingProviders); | ||
$this->initialState->provideInitialState('ai-text-processing-task-types', $textProcessingTaskTypes); | ||
|
||
$settings = [ | ||
'ai.stt_provider' => count($sttProviders) > 0 ? $sttProviders[0]['class'] : null, | ||
'ai.textprocessing_provider_preferences' => $textProcessingSettings, | ||
'ai.translation_provider_preferences' => $translationPreferences, | ||
]; | ||
foreach ($settings as $key => $defaultValue) { | ||
$value = $defaultValue; | ||
$json = $this->config->getAppValue('core', $key, ''); | ||
if ($json !== '') { | ||
$value = json_decode($json, true); | ||
switch($key) { | ||
case 'ai.textprocessing_provider_preferences': | ||
// fill $value with $defaultValue values | ||
$value = array_merge($defaultValue, $value); | ||
break; | ||
case 'ai.translation_provider_preferences': | ||
$value += array_diff($defaultValue, $value); // Add entries from $defaultValue that are not in $value to the end of $value | ||
Check notice Code scanning / Psalm PossiblyInvalidArgument Note
Argument 1 of array_diff expects array<array-key, mixed>, but possibly different type array<class-string<OCP\TextProcessing\ITaskType>|int<0, max>, class-string<OCP\TextProcessing\IProvider<OCP\TextProcessing\ITaskType>>|class-string<OCP\Translation\ITranslationProvider>>|class-string<OCP\SpeechToText\ISpeechToTextProvider>|null provided
|
||
break; | ||
default: | ||
break; | ||
} | ||
} | ||
$settings[$key] = $value; | ||
} | ||
|
||
$this->initialState->provideInitialState('ai-settings', $settings); | ||
|
||
return new TemplateResponse('settings', 'settings/admin/ai'); | ||
} | ||
|
||
/** | ||
* @return string the section ID, e.g. 'sharing' | ||
*/ | ||
public function getSection() { | ||
return 'ai'; | ||
} | ||
|
||
/** | ||
* @return int whether the form should be rather on the top or bottom of | ||
* the admin section. The forms are arranged in ascending order of the | ||
* priority values. It is required to return a value between 0 and 100. | ||
* | ||
* E.g.: 70 | ||
*/ | ||
public function getPriority() { | ||
return 10; | ||
} | ||
|
||
public function getName(): ?string { | ||
return $this->l->t('Artificial Intelligence'); | ||
} | ||
|
||
public function getAuthorizedAppConfig(): array { | ||
return [ | ||
'core' => ['/ai..*/'], | ||
]; | ||
} | ||
} |
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
Oops, something went wrong.
Oops, something went wrong.
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.
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note