Chore: Update new env and commit for app-backend

Zonalds · Aug 25, 2023 · afbdec2 · afbdec2
1 parent 22c73ba
commit afbdec2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/app-backend b/app-backend
diff --git a/conf/sample.env_app-backend b/conf/sample.env_app-backend
@@ -13,9 +13,11 @@ HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log,
 HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey
 HASURA_GRAPHQL_UNAUTHORIZED_ROLE="public"
 HASURA_GRAPHQL_METADATA_DEFAULTS='{"backend_configs":{"dataconnector":{"athena":{"uri":"http://data-connector-agent:8081/api/v1/athena"},"mariadb":{"uri":"http://data-connector-agent:8081/api/v1/mariadb"},"mysql8":{"uri":"http://data-connector-agent:8081/api/v1/mysql"},"oracle":{"uri":"http://data-connector-agent:8081/api/v1/oracle"},"snowflake":{"uri":"http://data-connector-agent:8081/api/v1/snowflake"}}}}'
-HASURA_GRAPHQL_JWT_SECRET={"type": "RS256", "key": "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----"}
+HASURA_GRAPHQL_JWT_SECRET={"jwk_url": "http://keycloak:8088/realms/hasura/protocol/openid-connect/certs"}
 
 # Environment variable for auto migrate
 HASURA_GRAPHQL_MIGRATIONS_DIR=/migrations
 HASURA_GRAPHQL_METADATA_DIR=/metadata
 HASURA_GRAPHQL_ENABLE_CONSOLE='true'
+HASURA_ACTION_STABLE_DIFFUSION_URL=http://stablediffusion:8087
+HASURA_EVENTS_HOOK_URL="http://worker:8787"
diff --git a/conf/sample.env_web-client b/conf/sample.env_web-client
@@ -16,4 +16,5 @@ NEXTAUTH_URL=http://localhost:3000
 NEXTAUTH_SECRET=my-secret
 END_SESSION_URL=http://keycloak:8088/realms/new-realm/protocol/openid-connect/logout
 REFRESH_TOKEN_URL=http://keycloak:8088/realms/new-realm/protocol/openid-connect/token
-HASURA_ADMIN_TOKEN=myadminsecretkey
+HASURA_ADMIN_TOKEN=myadminsecretkey
+NEXT_PUBLIC_GRAPHQL_ENGINE_URL=hasura:8080
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -70,6 +70,20 @@ services:
     networks:
       jan_community:
 
+  worker:
+    build:
+      context: ./app-backend
+      dockerfile: ./worker/Dockerfile
+    restart: always
+    environment:
+      - "NODE_ENV=development"
+    volumes:
+      - .:/worker
+    ports:
+      - "8787:8787"
+    networks:
+      jan_community:
+
   data-connector-agent:
     image: hasura/graphql-data-connector:v2.31.0
     restart: always

diff --git a/web-client b/web-client
+2 −1		.gitignore
+8 −1		README.md
+11 −0		docker-compose.yml
+1 −1		hasura/config.yaml
+18 −0		hasura/metadata/actions.graphql
+27 −3		hasura/metadata/actions.yaml
+19 −4		hasura/metadata/databases/jandb/tables/public_messages.yaml
+1 −0		hasura/migrations/jandb/1692885821205_alter_table_public_messages_add_column_status/down.sql
+2 −0		hasura/migrations/jandb/1692885821205_alter_table_public_messages_add_column_status/up.sql
+1 −0		hasura/migrations/jandb/1692891470212_alter_table_public_messages_add_column_prompt_cache/down.sql
+2 −0		hasura/migrations/jandb/1692891470212_alter_table_public_messages_add_column_prompt_cache/up.sql
+2 −2		hasura/seeds/jandb/1692710119690_productsSeed.sql
+1 −1		hasura/seeds/jandb/1692710371524_collectionProductsSeed.sql
+2 −0		sample.env
+14 −0		worker/Dockerfile
+113 −0		worker/worker.ts
+11 −0		worker/wrangler.toml
+6 −0		app/_components/AdvancedPrompt/index.tsx
+18 −9		app/_components/ChatBody/index.tsx
+14 −1		app/_components/ChatContainer/index.tsx
+2 −2		app/_components/CompactSideBar/index.tsx
+1 −1		app/_components/ConversationalCard/index.tsx
+1 −1		app/_components/GenerateImageCard/index.tsx
+4 −4		app/_components/GenerativeSampleContainer/index.tsx
+1 −1		app/_components/Header/index.tsx
+1 −1		app/_components/HistoryItem/index.tsx
+4 −4		app/_components/HistoryList/index.tsx
+25 −3		app/_components/InputToolbar/index.tsx
+5 −5		app/_components/ModelDetailSideBar/index.tsx
+1 −1		app/_components/OverviewPane.tsx
+4 −4		app/_components/SampleLlmContainer/index.tsx
+22 −1		app/_components/SimpleImageMessage/index.tsx
+55 −32		app/_components/SimpleTextMessage/index.tsx
+1 −1		app/_components/Slide/index.tsx
+1 −1		app/_components/UserProfileDropDown/index.tsx
+2 −2		app/_components/UserToolbar/index.tsx
+20 −4		app/_hooks/useCreateConversation.ts
+27 −61		app/_hooks/useGetUserConversations.ts
+3 −3		app/_models/AiModel.ts
+2 −2		app/_models/AiModelList.ts
+1 −1		app/_models/ChatMessage.ts
+2 −2		app/_models/Conversation.ts
+274 −212		app/_models/History.ts
+1 −325		app/_services/api/index.ts
+0 −19		app/_services/conversations.ts
+0 −16		app/_services/products.ts
+0 −16		app/_services/prompts.ts
+48 −15		app/page.client.tsx
+3 −0		graphql/fragments/conversation.graphql
+4 −0		graphql/fragments/message.graphql
+28 −8		graphql/generated/gql.ts
+150 −22		graphql/generated/graphql.ts
+2 −2		graphql/mutations/createConversation.graphql
+6 −4		graphql/mutations/createMessage.graphql
+19 −0		graphql/mutations/imageGeneration.graphql
+5 −0		graphql/mutations/updateMessage.graphql
+14 −0		graphql/queries/getConversationMessages.graphql
+6 −0		graphql/subscriptions/subscribeMessage.graphql
+5 −5		package.json