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

Pull Request for the implemented Changes in the WoPeD Client during the "Integrationsseminar" #167

Merged
merged 88 commits into from
Nov 11, 2024
+2,461 −1,127
Merged

Pull Request for the implemented Changes in the WoPeD Client during the "Integrationsseminar" #167

Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
04fa639
Added initial JFrame for P2T
anneke02 May 27, 2024
bb24ad5
Edited JFrame with radio buttons and added descriptions
anneke02 May 28, 2024
e41faa6
Added API key validation
anneke02 May 28, 2024
ea50494
Add focus in API key field
TimU02 May 28, 2024
2310eef
fork due to lack of write access
Marcel2511 Jun 4, 2024
d47be3c
Refactored Popup, added field for prompt
Marcel2511 Jun 4, 2024
4ee2795
added a settings option for the api key and prompt
Marcel2511 Jun 9, 2024
4006920
added api key validation
Marcel2511 Jun 9, 2024
9ae6edf
added default prompt in settings
Marcel2511 Jun 9, 2024
c4b02fe
added clause so that old/new UI doesn't show if checkAgain == false
Marcel2511 Jun 9, 2024
1d705eb
added checkbox in p2tUI "don't show again"
Marcel2511 Jun 9, 2024
0f0c449
refactored apikey validation
Marcel2511 Jun 9, 2024
72cda0e
added logic to show again button in old/new UI, added config changes …
Marcel2511 Jun 9, 2024
444322d
bixfix where prompt didnt update when changed in settings
Marcel2511 Jun 10, 2024
96331c6
Merge branch 'master' into master
Marcel2511 Jun 10, 2024
b1e2c5e
Merge pull request #1 from Marcel2511/master
Marcel2511 Jun 10, 2024
2420797
Refactor strings of P2TUI
anneke02 Jun 10, 2024
1c01d29
Make visibility of GPT settings selectable
TimU02 Jun 10, 2024
7c2271e
Merge remote-tracking branch 'origin/master'
TimU02 Jun 10, 2024
76f23d7
Fix bug
TimU02 Jun 10, 2024
01d6992
Make visibility of GPT settings selectable
TimU02 Jun 10, 2024
6d47e60
Refactor strings of P2TUI
anneke02 Jun 10, 2024
7347742
Fix bug
TimU02 Jun 10, 2024
d30b7ee
Merge branch 'master' of https://github.com/TimU02/WoPeD
zbbhelen Jun 10, 2024
ac66f0f
Fix string of messages file
anneke02 Jun 10, 2024
ae78aee
Enable old Service call from popup
TimU02 Jun 10, 2024
3d95afc
Merge remote-tracking branch 'origin/master'
TimU02 Jun 10, 2024
4a6ec73
Merge branch 'master' of https://github.com/TimU02/WoPeD
zbbhelen Jun 10, 2024
dbf61f2
added new config, so that the client remebers which version the endus…
Marcel2511 Jun 10, 2024
4e2803c
Merge branch 'master' of https://github.com/TimU02/WoPeD
zbbhelen Jun 10, 2024
1e23f67
preparations for implementation of logic in transform buttons
Marcel2511 Jun 10, 2024
0a34a42
Merge branch 'master' of https://github.com/TimU02/WoPeD
zbbhelen Jun 11, 2024
52cccde
Added Option to choose GPT Model in Settings
Marcel2511 Jun 12, 2024
eec2a1c
Added Dropdownmenu for gpt models in old / new switch panel
Marcel2511 Jun 12, 2024
da4d467
Added config for GPT Model so that the client remebers what was last …
Marcel2511 Jun 12, 2024
9c81bab
connected the client to the p2t backend
Marcel2511 Jun 12, 2024
6c25969
close popup on text-generation, added gptmodel selection to api call
Marcel2511 Jun 13, 2024
9d92449
Added logic to both old and new Call
Marcel2511 Jun 13, 2024
dd883d2
Old Service now works apart from localhost
Marcel2511 Jun 13, 2024
dbe02f0
Added API call from initial GUI
Marcel2511 Jun 13, 2024
7de3f45
Merge branch 'master' of https://github.com/TimU02/WoPeD
zbbhelen Jun 15, 2024
fa821ce
Refactor Strings of P2TUI
zbbhelen Jun 15, 2024
9cd9b59
Refactor Strings of ConfNLPToolsPanel
zbbhelen Jun 15, 2024
122e563
Revert "Refactor Strings of P2TUI"
zbbhelen Jun 15, 2024
d484abe
Revert "Refactor Strings of ConfNLPToolsPanel"
zbbhelen Jun 15, 2024
d7b5abe
add "json-simple" dependency for "ParseException" of P2TUI
zbbhelen Jun 15, 2024
c5ad7c9
Refactor Strings of P2TUI
zbbhelen Jun 15, 2024
7eb7d6b
Refactor Strings of ConfNLPToolsPanel
zbbhelen Jun 15, 2024
e90835e
Cleanup, formatting
Marcel2511 Jun 17, 2024
014df70
made sure that settings dont crash if service isn't available
Marcel2511 Jun 17, 2024
721caf1
P2TUI Unit Test
zbbhelen Jun 26, 2024
dd3f200
Remove unused mediator
anneke02 Jun 29, 2024
78a0087
Made sure that popup window closes upon generating a text
Marcel2511 Jul 1, 2024
edbdbe5
update P2TUI Unit Test
zbbhelen Jul 1, 2024
d584d46
Refactoring, Cleanup, Comments
Marcel2511 Jul 1, 2024
6ce1412
removed unused method
Marcel2511 Jul 1, 2024
e797445
translated comments, refactored compoents, removed unused components
Marcel2511 Jul 1, 2024
162e587
fixed a bug where the keyfield for the apikey aswell as the dropdownm…
Marcel2511 Jul 1, 2024
35b8de0
Added refactoring of prompt string
anneke02 Jul 2, 2024
baad942
Delete prints
anneke02 Jul 2, 2024
106fc67
Merge master
anneke02 Jul 2, 2024
2e0ee2a
Merge pull request #2 from TimU02/RefactoringAndTesting
TimU02 Jul 2, 2024
b52868e
added a fetchgptmodels button for fetching gpt models
Marcel2511 Jul 2, 2024
24e6c91
Fixed a Bug where the prompt would reset if the boolean value of the …
Marcel2511 Jul 3, 2024
5ec0db3
CleanUp + Logging
Marcel2511 Jul 3, 2024
40273b9
cleanup
zbbhelen Jul 4, 2024
8ac6196
Initiale test for P2TUI
anneke02 Jul 5, 2024
595e37e
Remove accidental character
anneke02 Jul 5, 2024
1c92598
Add tests for initializeSwitchButtonPanel
anneke02 Jul 5, 2024
ec3870a
Finalize test for initializeSwitchButtonPanel
anneke02 Jul 5, 2024
d735e13
add test for IsAPIKeyValid
zbbhelen Jul 5, 2024
f4e0f29
add Test for ValidateAPIKey
zbbhelen Jul 5, 2024
c9b4f85
Delete api key tests
anneke02 Jul 5, 2024
7c5dcc5
Add test for SingleButtonPanel
anneke02 Jul 5, 2024
9a8303b
Add test for executeAction in P2TUI
anneke02 Jul 5, 2024
7db307a
Added api key valid test method for invalid case
anneke02 Jul 5, 2024
3f0364c
Delete unused methods
TimU02 Jul 5, 2024
edcb438
Refactor test for P2TUI methods
anneke02 Jul 5, 2024
b0e8ea5
Remove unused import
anneke02 Jul 5, 2024
2890288
Refactoring
Marcel2511 Jul 5, 2024
4e34f9f
Add doc and JavaDoc to P2TUI and tests
anneke02 Jul 5, 2024
e7817bb
Add doc and JavaDoc to P2TUI and tests
anneke02 Jul 5, 2024
b25ce19
refactoring
Marcel2511 Jul 7, 2024
96d46c3
Refactor Strings
TimU02 Jul 7, 2024
a610dc8
Refactor String
TimU02 Jul 7, 2024
0db9edd
Refactor settings strings
anneke02 Jul 7, 2024
4315d24
Refactor Strings
TimU02 Jul 7, 2024
dee699c
remove unused import
zbbhelen Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor settings strings
@anneke02
anneke02 committed Jul 7, 2024
commit 0db9eddf0de4116c609e7dde947448099ece64c6
4 changes: 2 additions & 2 deletions WoPeD-GUI/src/main/resources/Messages_de.properties
View file
Original file line number Diff line number Diff line change
@@ -828,12 +828,12 @@ Configuration.GPT.prompt.Title = Prompt
Configuration.GPT.show.again.Title = Erneut anzeigen
Configuration.GPT.standard.Title = Auf Standard zur\u00FCcksetzen
Configuration.GPT.connection.Title = Verbindung pr\u00FCfen
Configuration.GPT.settings.Title = GPT-Einstellungn
Configuration.GPT.settings.Title = GPT-Einstellungen
Configuration.GPT.model.Title = GPT-Model
Configuration.GPT.tool.tip.text.Title = Test
Configuration.GPT.connection.successful.Title = GPT-Verbindung erfolgreich. Antwort-Code:
Configuration.GPT.connection.failed.Title = GPT-Verbindung fehlgeschlagen. Antwort-Code:
Configuration.GPT.connection.test.Title = Verbindung pr�fen
Configuration.GPT.connection.test.Title = Verbindung pr\u00FCfen
Configuration.GPT.connection.test.failed.Title = GPT-Verbindungstest fehlgeschlagen: