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.

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

Intelligence Service MVP Java Spring Boot setup #168

Merged
merged 81 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
1dcc346
Add message entity and logic
milesha Nov 18, 2024
ddcca98
Change step model
milesha Nov 18, 2024
19bcd9f
Update chat logic
milesha Nov 18, 2024
6bea3b5
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
milesha Nov 18, 2024
811800f
Fix openai generation error
milesha Nov 19, 2024
7ac6de2
Delete unused imports
milesha Nov 19, 2024
945bc30
Add chat and message
milesha Nov 19, 2024
4a5c287
Rename chat to session
milesha Nov 19, 2024
918ade5
#124 bug fix
milesha Nov 19, 2024
a7a7130
Add new specs for chat
milesha Nov 19, 2024
246bd3b
Change placement of sesion
milesha Nov 19, 2024
12acb52
Delete unused imports
milesha Nov 19, 2024
0f8f5a0
Uodate chat logic
milesha Nov 21, 2024
c9b05bc
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
milesha Nov 21, 2024
52b1b0f
Update message params
milesha Nov 21, 2024
edc4dee
Change DTO params
milesha Nov 21, 2024
3233344
Update api
milesha Nov 21, 2024
68dfb80
Change id generation
milesha Nov 21, 2024
6bf4061
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
milesha Nov 22, 2024
2bbd8c8
Change ZonedDateTime to Offset
milesha Nov 22, 2024
d956490
Change creation prop
milesha Nov 22, 2024
cb11c80
Update saving process
milesha Nov 22, 2024
042da81
Fix repository bug
milesha Nov 23, 2024
25941cb
Fix database bugs
milesha Nov 23, 2024
bcf8b0a
Fix database updates
milesha Nov 23, 2024
cece4a2
Add fastapi connection
milesha Nov 23, 2024
c504570
Update FastAPI connection
milesha Nov 24, 2024
e7a137e
Folrmating
milesha Nov 24, 2024
82d283c
Formating
milesha Nov 24, 2024
6451e5d
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
milesha Nov 24, 2024
8ad3fae
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
milesha Nov 25, 2024
f7809df
Add autowired to messageservice
milesha Nov 25, 2024
1561023
Resolve teams pr conflicts
milesha Nov 25, 2024
61e0210
Add error handling
milesha Nov 25, 2024
470755a
Improve code styling
milesha Nov 25, 2024
5372aa6
Fix coding conventions violiations
milesha Nov 25, 2024
25c63d4
SImpllify code
milesha Nov 25, 2024
de37ad9
Update content col length
milesha Nov 25, 2024
91f7040
Update prompt
milesha Nov 25, 2024
ad053a4
Update naming
milesha Nov 25, 2024
bf74fdd
Fix bug
milesha Nov 25, 2024
b63a9df
Update column type
milesha Nov 26, 2024
13b80c5
fix chat generation
milesha Nov 27, 2024
0e43a7d
change naming
milesha Nov 27, 2024
ddca852
update packages
milesha Nov 28, 2024
e468492
update mentor logic
milesha Nov 28, 2024
eda63de
Update bot logic
milesha Dec 1, 2024
12673c9
Format
milesha Dec 1, 2024
24ee85b
Change prompt
milesha Dec 1, 2024
3bbb6c0
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
FelixTJDietrich Dec 4, 2024
dd53b38
Intelligence Service MVP Chat Interface (#169)
milesha Dec 4, 2024
b5b589a
move to correct package
FelixTJDietrich Dec 4, 2024
39a774c
format realm config
FelixTJDietrich Dec 4, 2024
7bc3cf9
add mentor_access to keycloak
FelixTJDietrich Dec 4, 2024
cfb80c0
fix mentor access
FelixTJDietrich Dec 4, 2024
80a24bd
move stuff around
FelixTJDietrich Dec 4, 2024
fb80e0b
restructure client code
FelixTJDietrich Dec 5, 2024
5729200
fix naming
FelixTJDietrich Dec 5, 2024
bb2c8a4
prompt fix
milesha Dec 8, 2024
5a52636
add optimistic updates
milesha Dec 8, 2024
194de29
Merge branch 'feature/java-chat-mvp-intelligence-service' of https://…
milesha Dec 8, 2024
3cc30d1
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
milesha Dec 8, 2024
317727a
fix responsiveness
FelixTJDietrich Dec 8, 2024
69666fc
fix mobile
FelixTJDietrich Dec 8, 2024
ac05872
add optimistic update and scroll to bottom
FelixTJDietrich Dec 8, 2024
02901b9
fix button
FelixTJDietrich Dec 8, 2024
16af99e
fix client qa
FelixTJDietrich Dec 8, 2024
f3e200b
add skeleton start-session
milesha Dec 8, 2024
eb2904e
change layout
milesha Dec 8, 2024
b969125
fix layout for multuple sessions
milesha Dec 8, 2024
a008a21
add intelligence service config and prefix api models
FelixTJDietrich Dec 8, 2024
88040bd
Merge branch 'develop' into feature/java-chat-mvp-intelligence-service
FelixTJDietrich Dec 8, 2024
cbff9f5
fix loading state
milesha Dec 8, 2024
89aef02
Merge branch 'feature/java-chat-mvp-intelligence-service' of https://…
milesha Dec 8, 2024
ae154dc
fix eslint
milesha Dec 8, 2024
0277cd3
add intelligence service to compose
FelixTJDietrich Dec 8, 2024
617c107
Merge branch 'feature/java-chat-mvp-intelligence-service' of github.c…
FelixTJDietrich Dec 8, 2024
9599ed4
connect application server to intelligence service
FelixTJDietrich Dec 8, 2024
2e60767
add migration
FelixTJDietrich Dec 8, 2024
2d827cb
restructure intelligence service
FelixTJDietrich Dec 8, 2024
316eefc
format
FelixTJDietrich Dec 8, 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
23 changes: 23 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
- DATABASE_PASSWORD=root
- SECURITY_USER_NAME=${SECURITY_USER_NAME:-admin}
- SECURITY_USER_PASSWORD=${SECURITY_USER_NAME:-admin_password}
- INTELLIGENCE_SERVICE_URL=http://intelligence-service:8000
depends_on:
- postgres
networks:
Expand All @@ -21,6 +22,28 @@ services:
retries: 5
start_period: 30s

intelligence-service:
build: server/intelligence-service
environment:
# Either OPENAI_API_KEY or AZURE_OPENAI_API_KEY must be set
- OPENAI_API_KEY
- AZURE_OPENAI_API_KEY
- AZURE_OPENAI_ENDPOINT
- AZURE_OPENAI_API_VERSION
networks:
- app-network
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
interval: 30s
timeout: 10s
retries: 5
start_period: 3s
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"

postgres:
image: 'postgres:16'
environment:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"generate:api:application-server": "npm run generate:api:application-server:specs && npm run generate:api:application-server:clean && npm run generate:api:application-server:client",
"generate:api:intelligence-service:clean": "shx rm -rf server/application-server/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice",
"generate:api:intelligence-service:specs": "python -m server.intelligence-service.app.generate_openapi_yaml",
"generate:api:intelligence-service:client": "npx openapi-generator-cli generate -i server/intelligence-service/openapi.yaml -g java --library resttemplate --api-package de.tum.in.www1.hephaestus.intelligenceservice.api --model-package de.tum.in.www1.hephaestus.intelligenceservice.model --invoker-package de.tum.in.www1.hephaestus.intelligenceservice --additional-properties useJakartaEe=true,performBeanValidation=true,generateClientAsBean=true,hideGenerationTimestamp=true --package-name de.tum.in.www1.hephaestus.intelligenceservice -o tmp/java-client && shx cp -r tmp/java-client/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice server/application-server/src/main/java/de/tum/in/www1/hephaestus && shx rm -rf tmp",
"generate:api:intelligence-service:client": "npx openapi-generator-cli generate -i server/intelligence-service/openapi.yaml -g java --library resttemplate --api-package de.tum.in.www1.hephaestus.intelligenceservice.api --model-package de.tum.in.www1.hephaestus.intelligenceservice.model --invoker-package de.tum.in.www1.hephaestus.intelligenceservice --model-name-prefix IS --additional-properties useJakartaEe=true,performBeanValidation=true,hideGenerationTimestamp=true --package-name de.tum.in.www1.hephaestus.intelligenceservice -o tmp/java-client && shx cp -r tmp/java-client/src/main/java/de/tum/in/www1/hephaestus/intelligenceservice server/application-server/src/main/java/de/tum/in/www1/hephaestus && shx rm -rf tmp",
"generate:api:intelligence-service": "npm run generate:api:intelligence-service:clean && npm run generate:api:intelligence-service:specs && npm run generate:api:intelligence-service:client",
"generate:api": "npm run generate:api:intelligence-service && npm run generate:api:application-server",
"format:java:check": "prettier --check server/application-server/src/**/*.java",
Expand Down
Loading
Loading