Move Bedrock and OpenAi to aikit

ues-io · Jun 19, 2024 · 035f6fa · 035f6fa
1 parent 2b27cf8
commit 035f6fa
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 8 deletions.
diff --git a/apps/platform/pkg/bot/systemdialect/systemdialect.go b/apps/platform/pkg/bot/systemdialect/systemdialect.go
@@ -147,7 +147,7 @@ func (b *SystemDialect) RunIntegrationActionBot(bot *meta.Bot, ic *wire.Integrat
 
 	// Intercept system integration types
 	switch ic.GetIntegrationType().GetKey() {
-	case "uesio/core.bedrock":
+	case "uesio/aikit.bedrock":
 		botFunction = bedrock.RunAction
 	case "uesio/core.openai":
 		botFunction = openai.RunAction

diff --git a/apps/platform/pkg/configstore/environment/environment.go b/apps/platform/pkg/configstore/environment/environment.go
@@ -39,6 +39,7 @@ var configValues = map[string]string{
 	"uesio/core.platform_filesource_credentials":  GetEnvWithDefault("UESIO_PLATFORM_FILESOURCE_CREDENTIALS", "uesio/core.aws"),
 	"uesio/core.platform_bundlestore_credentials": GetEnvWithDefault("UESIO_PLATFORM_BUNDLESTORE_CREDENTIALS", "uesio/core.aws"),
 	"uesio/core.aws_region":                       os.Getenv("AWS_REGION"),
+	"uesio/aikit.aws_region":                      os.Getenv("AWS_REGION"),
 	"uesio/core.userfiles_bucket_name":            GetEnvWithDefault("UESIO_USERFILES_BUCKET_NAME", "uesio-userfiles"),
 	"uesio/core.db_host":                          GetRequiredEnv("UESIO_DB_HOST"),
 	"uesio/core.db_port":                          GetEnvWithDefault("UESIO_DB_PORT", "5432"),

diff --git a/apps/platform/pkg/secretstore/environment/environment.go b/apps/platform/pkg/secretstore/environment/environment.go
@@ -12,12 +12,15 @@ type SecretStore struct {
 }
 
 var secretValues = map[string]string{
-	"uesio/core.aws_access_key_id":     os.Getenv("AWS_ACCESS_KEY_ID"),
-	"uesio/core.aws_secret_access_key": os.Getenv("AWS_SECRET_ACCESS_KEY"),
-	"uesio/core.aws_session_token":     os.Getenv("AWS_SESSION_TOKEN"),
-	"uesio/core.db_user":               os.Getenv("UESIO_DB_USER"),
-	"uesio/core.db_password":           os.Getenv("UESIO_DB_PASSWORD"),
-	"uesio/core.db_database":           os.Getenv("UESIO_DB_DATABASE"),
+	"uesio/core.aws_access_key_id":      os.Getenv("AWS_ACCESS_KEY_ID"),
+	"uesio/core.aws_secret_access_key":  os.Getenv("AWS_SECRET_ACCESS_KEY"),
+	"uesio/core.aws_session_token":      os.Getenv("AWS_SESSION_TOKEN"),
+	"uesio/aikit.aws_access_key_id":     os.Getenv("AWS_ACCESS_KEY_ID"),
+	"uesio/aikit.aws_secret_access_key": os.Getenv("AWS_SECRET_ACCESS_KEY"),
+	"uesio/aikit.aws_session_token":     os.Getenv("AWS_SESSION_TOKEN"),
+	"uesio/core.db_user":                os.Getenv("UESIO_DB_USER"),
+	"uesio/core.db_password":            os.Getenv("UESIO_DB_PASSWORD"),
+	"uesio/core.db_database":            os.Getenv("UESIO_DB_DATABASE"),
 }
 
 func (ss *SecretStore) Get(key string, session *sess.Session) (string, error) {

diff --git a/libs/apps/uesio/aikit/bundle/componentpacks/main/src/utilities/claudebutton/claudebutton.tsx b/libs/apps/uesio/aikit/bundle/componentpacks/main/src/utilities/claudebutton/claudebutton.tsx
@@ -72,7 +72,7 @@ const ClaudeInvokeButton: definition.UtilityComponent<Props> = (props) => {
 						[
 							{
 								signal: "integration/RUN_ACTION",
-								integration: "uesio/core.bedrock",
+								integration: "uesio/aikit.bedrock",
 								action: "streammodel",
 								stepId,
 								params: {

diff --git a/libs/apps/uesio/aikit/bundle/configvalues/aws_region.yaml b/libs/apps/uesio/aikit/bundle/configvalues/aws_region.yaml
@@ -0,0 +1,3 @@
+name: aws_region
+managedBy: app
+store: environment
diff --git a/libs/apps/uesio/aikit/bundle/credentials/aws.yaml b/libs/apps/uesio/aikit/bundle/credentials/aws.yaml
@@ -0,0 +1,7 @@
+name: aws
+type: AWS_KEY
+awsKey:
+  region: uesio/aikit.aws_region
+  accessKeyId: uesio/aikit.aws_access_key_id
+  secretAccessKey: uesio/aikit.aws_secret_access_key
+  sessionToken: uesio/aikit.aws_session_token
diff --git a/...uesio/core/bundle/credentials/openai.yaml → ...esio/aikit/bundle/credentials/openai.yaml b/...uesio/core/bundle/credentials/openai.yaml → ...esio/aikit/bundle/credentials/openai.yaml
diff --git a/...tions/uesio/core/bedrock/invokemodel.yaml → ...ions/uesio/aikit/bedrock/invokemodel.yaml b/...tions/uesio/core/bedrock/invokemodel.yaml → ...ions/uesio/aikit/bedrock/invokemodel.yaml
diff --git a/...tions/uesio/core/bedrock/streammodel.yaml → ...ions/uesio/aikit/bedrock/streammodel.yaml b/...tions/uesio/core/bedrock/streammodel.yaml → ...ions/uesio/aikit/bedrock/streammodel.yaml
diff --git a/...tions/uesio/core/openai/autocomplete.yaml → ...ions/uesio/aikit/openai/autocomplete.yaml b/...tions/uesio/core/openai/autocomplete.yaml → ...ions/uesio/aikit/openai/autocomplete.yaml
diff --git a/...sio/core/bundle/integrations/bedrock.yaml → ...io/aikit/bundle/integrations/bedrock.yaml b/...sio/core/bundle/integrations/bedrock.yaml → ...io/aikit/bundle/integrations/bedrock.yaml
diff --git a/...esio/core/bundle/integrations/openai.yaml → ...sio/aikit/bundle/integrations/openai.yaml b/...esio/core/bundle/integrations/openai.yaml → ...sio/aikit/bundle/integrations/openai.yaml
diff --git a/...core/bundle/integrationtypes/bedrock.yaml → ...ikit/bundle/integrationtypes/bedrock.yaml b/...core/bundle/integrationtypes/bedrock.yaml → ...ikit/bundle/integrationtypes/bedrock.yaml
diff --git a/.../core/bundle/integrationtypes/openai.yaml → ...aikit/bundle/integrationtypes/openai.yaml b/.../core/bundle/integrationtypes/openai.yaml → ...aikit/bundle/integrationtypes/openai.yaml
diff --git a/libs/apps/uesio/aikit/bundle/secrets/aws_access_key_id.yaml b/libs/apps/uesio/aikit/bundle/secrets/aws_access_key_id.yaml
@@ -0,0 +1,3 @@
+name: aws_access_key_id
+managedBy: app
+store: environment
diff --git a/libs/apps/uesio/aikit/bundle/secrets/aws_secret_access_key.yaml b/libs/apps/uesio/aikit/bundle/secrets/aws_secret_access_key.yaml
@@ -0,0 +1,3 @@
+name: aws_secret_access_key
+managedBy: app
+store: environment
diff --git a/libs/apps/uesio/aikit/bundle/secrets/aws_session_token.yaml b/libs/apps/uesio/aikit/bundle/secrets/aws_session_token.yaml
@@ -0,0 +1,3 @@
+name: aws_session_token
+managedBy: app
+store: environment
diff --git a/.../uesio/core/bundle/secrets/openaikey.yaml → ...uesio/aikit/bundle/secrets/openaikey.yaml b/.../uesio/core/bundle/secrets/openaikey.yaml → ...uesio/aikit/bundle/secrets/openaikey.yaml