Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[stable27] fix: missing argument for TextProcessing Manager #39774

Closed
wants to merge 101 commits into from
Closed

[stable27] fix: missing argument for TextProcessing Manager #39774

wants to merge 101 commits into from

Conversation

marcelklehr
Copy link
Member

Checklist

@marcelklehr
Initial work on lm OCP API
2e9dea2 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 70d5bf7)
@marcelklehr
LLM OCP API: Rework to use Task objects
457f1eb 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 01dd1a8)
@marcelklehr
LLM OCP API: Implement private backend code + add ILanguageModelTask
d20ee42 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 3413873)
@marcelklehr
LLM OCP API: Add db migration
7031072 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 6fc4cb6)
@marcelklehr
LLM OCP API: Add to RegistrationContext
ed3672a 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 82d3b00)
@marcelklehr
Fix Copyright
33f3379 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 9e9fc1d)
@marcelklehr
LLM OCP API: ADd topics and headline tasks
5807c43 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 9d5717d)
@marcelklehr
LLM OCP API: Implement ocs API
236c32b 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>

(cherry picked from commit 795b097)
@marcelklehr
LLM OCP API: cs:fix
76a5db8 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit b6941aa)
@marcelklehr
LLM OCP API: Make linters happy
01db2cf 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit b8a9f08)
@marcelklehr
LLM OCP API: Fix type errors
dbd9420 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit b6a95e3)
@marcelklehr
LLM OCP API: Add @SInCE
0024f0d 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 9935034)
@marcelklehr
LLM OCP API: Fix static analysis
02c78be 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit fac83ce)
@marcelklehr
LLM OCP API: cs:fix
612af73 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 75d7af8)
@marcelklehr
LLM OCP API: Fix coding style and psalm
dd7eafa 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 72ea761)
@marcelklehr
Update lib/public/LanguageModel/ITopicsProvider.php
6320c68 
Co-authored-by: Julien Veyssier <julien-nc@posteo.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 249dd5c)
@marcelklehr
LLM OCP API: Add task definitions
ecda18b 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit fb4de16)
@marcelklehr
LLM OCP API: Commit autoloaders
1ac86d2 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 5bc6180)
@marcelklehr
Update lib/public/AppFramework/Bootstrap/IRegistrationContext.php
4e3ca11 
Co-authored-by: Daniel <mail@danielkesselberg.de>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit fb55afc)
@marcelklehr
Apply suggestions from code review
4405027 
Co-authored-by: Daniel <mail@danielkesselberg.de>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 8e4aa92)
@marcelklehr
LLM OCP API: Type shenanigans for Visitor pattern
c8bbe8f 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 906e9b7)
@marcelklehr
LLM OCP API: strict types and copyright
ddeaaea 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 83db23e)
@marcelklehr
OCP: Introduce OCP\Common\Exception\NotFoundException
d203e3a 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit a7cd6bf)
@marcelklehr
LLM OCP API: Use OCP\Common\Exception\NotFoundException
fb9262e 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit b00a9a6)
@marcelklehr
LLM OCP API: Fix copyright
e90dd4a 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 94fcf88)
@marcelklehr
cs:fix
44ce285 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 1d3661d)
@marcelklehr
Add tasks::last_updated column and vacate tasks after a week
91325ef 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit cb0f918)
@marcelklehr
TaskMapper#update: Use time factory
2234497 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 1623ad9)
@marcelklehr
ILanguageModelManager: Add docblock description
970d688 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 0a94525)
@marcelklehr
ILanguageModelTask: Use php type checking along with psalm parameteri…
c1085bf 
…zed types

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 27e1c86)
marcelklehr and others added 24 commits August 9, 2023 10:22
@marcelklehr
First pass at ai admin settings
cc5818f 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit fc9780a)
@marcelklehr
AI Admin settings: Implement mt settings, stt settings and tp settings
43926a2 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 4e33d04)
@marcelklehr
fix(TextProcessing): Inject L10N\IFactory instead of IL10N
d4b2012 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 8ec1926)
@marcelklehr
AI admin settings: Add save mechanism
674fd35 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit a840e8c)
@marcelklehr
AI admin settings: Use config values in AI feature managers
7fd0b1b 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 2a3ef10)
@marcelklehr
AI admin settings: Add a draggable icon in UI for translation provide…
850a92e 
…r precedence

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 2d29413)
@marcelklehr
AI admin settings: Update composer autoloaders
40d4da1 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit aa74d6f)
@marcelklehr
AI admin settings: strict_types
6c8c047 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit f72f3f7)
@marcelklehr
AI admin settings: cs:fix
832e0d3 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 4ec150c)
@marcelklehr
AI admin settings: lint:fix
8507112 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>

(cherry picked from commit 112268a)
@marcelklehr
AI admin settings: lint:fix
9e6a864 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit a193458)
@marcelklehr
AI admin settings: lint:fix
4b97ec7 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit be7487b)
@marcelklehr
Migration: Drop llm_tasks table and add textprocessing_tasks
50adc8c 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit ad3f353)
@marcelklehr
Fix typo
f4160e0 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit a0eaed0)
@marcelklehr
Update apps/settings/src/components/AdminAI.vue
d13ceb3 
Co-authored-by: Julien Veyssier <julien-nc@posteo.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 3ca4428)
@marcelklehr
Update apps/settings/src/components/AdminAI.vue
dbcfef1 
Co-authored-by: Julien Veyssier <julien-nc@posteo.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit ff39466)
@marcelklehr
Admin AI settings: Improve a11y of machine translation precendence
3d9a588 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 830692c)
@marcelklehr
Admin AI settings: Use ContainerInterface instead of IServerContainer
8dee7d0 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
(cherry picked from commit 7adb2ce)
@julien-nc @marcelklehr
move long click handlers into methods
52a1748 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit 5776406)
@julien-nc @marcelklehr
use DB type constants
f95cf63 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit 601679b)
@julien-nc @marcelklehr
polish AI admin settings UI
67fa798 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit 0ace67c)
@julien-nc @marcelklehr
fix wrong NcSelect event in AI admin settings
0029171 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit a877865)
@julien-nc @marcelklehr
fix composer autoload files
2d9a064 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit 8d6a6e5)
@kesselb @marcelklehr
fix: missing argument for TextProcessing Manager
4bae251 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@marcelklehr marcelklehr mentioned this pull request Aug 9, 2023
Closed
4 tasks
github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 9, 2023
View reviewed changes
apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
switch($key) {
case 'ai.textprocessing_provider_preferences':
// fill $value with $defaultValue values
$value = array_merge($defaultValue, $value);

Check notice

Code scanning / Psalm

PossiblyInvalidArgument Note

Argument 1 of array_merge 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
apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
$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
@marcelklehr marcelklehr closed this Aug 9, 2023
@skjnldsv skjnldsv deleted the backport/39684/stable27 branch March 14, 2024 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kesselb kesselb Awaiting requested review from kesselb

@julien-nc julien-nc Awaiting requested review from julien-nc

@Pytal Pytal Awaiting requested review from Pytal Pytal will be requested when the pull request is marked ready for review Pytal is a code owner

@JuliaKirschenheuter JuliaKirschenheuter Awaiting requested review from JuliaKirschenheuter JuliaKirschenheuter will be requested when the pull request is marked ready for review JuliaKirschenheuter is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marcelklehr @julien-nc @kesselb