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

Aspire orchestration #271

Merged
merged 11 commits into from
Nov 26, 2024
Merged

Aspire orchestration #271

merged 11 commits into from
Nov 26, 2024

Conversation

tommasodotNET
Copy link
Contributor

No description provided.

tommasodotNET and others added 3 commits November 26, 2024 22:41
* aspire-ize semantic workbench

* using localhost globally

* working example with aspire and uvicorn integration

* dynamic python port

* python assistant port defined via env var

* python assistant read workbench service url from env

* reverting port changes for python services

* using correct env var for python assistant and dockerfile for FE

* use custom env var for workbench service endpoint in app

* correct injection of workbench servic endoint

* ensure correct env var are used in dotnet example 3

* deploy via azd using workaround for dockerfile

* using correct env var for workbench_service url in python assistants

* working deployment with azd

* don't pass port during frontend docker build - not needed

* working deployment with hardcoded appids in wk service

* update doc

* app registration id is now picked from .env in docker

* working deployment of dotnet example

* working assistant deployment

* reorders apphost

* reorders packages

* cleans up

* adds doc

* uses new start assistant

* imrpove doc

* updates doc

* fixes assistant container params

* differentiate aspire dockerfile from already existing ones

* Minor code style changes

* cleans workbench app dockerfile

* back to 127.0.0.1 on workbench config

* fixes workbench app docker-entrypoint logs

* revert space on start

* removed next-steps.md

* removes sshd from Dockerfile workbench service and assistant

* reverts .env.example

* reverts settings.py

* improve readme

* improves readme requirements

* Update aspire-orchestrator/SemanticWorkbench.Aspire.Hosting.Extensions/PathNormalizer.cs

Co-authored-by: Devis Lucato <[email protected]>

* Update aspire-orchestrator/SemanticWorkbench.Aspire.Hosting.Extensions/PathNormalizer.cs

Co-authored-by: Devis Lucato <[email protected]>

* fixes folder for apphost in doc

* using arg value for vite_semanticworkbenchurl

* moves dockerfileextensions to separate class

* aspire overwrites correct var env for agents

* adds copyright

* Revert "using arg value for vite_semanticworkbenchurl"

This reverts commit b0d15ae.

* deletes aspire-manifest

* uses workaround for workbench service url in frontend

* dockerignore .env files

* dockerignore .azure folder

* adds comment on agent autoreference

* adds doc for dotnet dev certs

* use env var for entra ID config

* read entraid config from appsettings

* adds default values for app registration

* Code style

* Update workbench-service/.env.example

* Add comment to new docker file

* Code style

* Revert code style changes

* Revert changes to agent 3 csproj

* Update examples/dotnet/dotnet-03-simple-chatbot/Program.cs

* Update examples/dotnet/dotnet-03-simple-chatbot/dotnet-03-simple-chatbot.csproj

* Update libraries/python/semantic-workbench-assistant/semantic_workbench_assistant/settings.py

* Update workbench-app/src/Constants.ts

* Update workbench-app/src/global.d.ts

* Fix SLN filename

* Fix project names

* Reorg projects

* removes console logs

* removes reference to workbench service: using custom env var for dotnet agent

* aspire-ize semantic workbench

using localhost globally

working example with aspire and uvicorn integration

dynamic python port

python assistant port defined via env var

python assistant read workbench service url from env

reverting port changes for python services

using correct env var for python assistant and dockerfile for FE

use custom env var for workbench service endpoint in app

correct injection of workbench servic endoint

ensure correct env var are used in dotnet example 3

deploy via azd using workaround for dockerfile

using correct env var for workbench_service url in python assistants

working deployment with azd

don't pass port during frontend docker build - not needed

working deployment with hardcoded appids in wk service

update doc

app registration id is now picked from .env in docker

working deployment of dotnet example

working assistant deployment

reorders apphost

reorders packages

cleans up

adds doc

uses new start assistant

imrpove doc

updates doc

fixes assistant container params

differentiate aspire dockerfile from already existing ones

cleans workbench app dockerfile

Minor code style changes

back to 127.0.0.1 on workbench config

fixes workbench app docker-entrypoint logs

revert space on start

removed next-steps.md

removes sshd from Dockerfile workbench service and assistant

reverts .env.example

reverts settings.py

improve readme

improves readme requirements

fixes folder for apphost in doc

Update aspire-orchestrator/SemanticWorkbench.Aspire.Hosting.Extensions/PathNormalizer.cs

Co-authored-by: Devis Lucato <[email protected]>

Update aspire-orchestrator/SemanticWorkbench.Aspire.Hosting.Extensions/PathNormalizer.cs

Co-authored-by: Devis Lucato <[email protected]>

using arg value for vite_semanticworkbenchurl

moves dockerfileextensions to separate class

aspire overwrites correct var env for agents

adds copyright

Revert "using arg value for vite_semanticworkbenchurl"

This reverts commit b0d15ae.

deletes aspire-manifest

uses workaround for workbench service url in frontend

dockerignore .env files

dockerignore .azure folder

adds comment on agent autoreference

adds doc for dotnet dev certs

use env var for entra ID config

read entraid config from appsettings

adds default values for app registration

Code style

Update workbench-service/.env.example

Add comment to new docker file

Code style

Revert code style changes

Revert changes to agent 3 csproj

Update examples/dotnet/dotnet-03-simple-chatbot/Program.cs

Update examples/dotnet/dotnet-03-simple-chatbot/dotnet-03-simple-chatbot.csproj

Update libraries/python/semantic-workbench-assistant/semantic_workbench_assistant/settings.py

Update workbench-app/src/Constants.ts

Update workbench-app/src/global.d.ts

Fix SLN filename

Fix project names

Revert code style changes

Revert changes to agent 3 csproj

Update examples/dotnet/dotnet-03-simple-chatbot/Program.cs

Update examples/dotnet/dotnet-03-simple-chatbot/dotnet-03-simple-chatbot.csproj

Update libraries/python/semantic-workbench-assistant/semantic_workbench_assistant/settings.py

Update workbench-app/src/Constants.ts

Update workbench-app/src/global.d.ts

Fix SLN filename

Fix project names

Update libraries/python/semantic-workbench-assistant/semantic_workbench_assistant/settings.py

Update workbench-app/src/Constants.ts

Update workbench-app/src/global.d.ts

Fix SLN filename

Fix project names

Reorg projects

Fix URLs and ping errors

Handle ping exceptions

Improve logging

Change ping frequency

Auto detect port in use and better handle some exceptions

Rebasing

Update workbench-service/.env.example

Update workbench-app/.env.example

Fix merge

Fix merge

Fix merge

* Remove connector from SLN

* only send connectorhost rather then full /myagents path

* fixes dotnet agent connection w/ sw service

* removes old dockerfiles

* fixes workbench connector

* fixes workbench app entra id config

* wb connector

---------

Co-authored-by: Devis Lucato <[email protected]>
Co-authored-by: Devis Lucato <[email protected]>
Copy link
Contributor

@dluc dluc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dluc dluc merged commit 637f30e into microsoft:main Nov 26, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants