Rama miguel

.github/workflows/release.yml

@@ -1,9 +1,19 @@
-name: CI for wichat_0
+name: CI for wichat_es4c
 
 on:
   release:
     types: [published]
-
+  workflow_dispatch:
+    inputs:
+        logLevel:
+          description: 'Log level'
+          required: true
+          default: 'warning'
+          type: choice
+          options:
+            - info
+            - warning
+            - debug
 jobs:
   unit-tests:
     runs-on: ubuntu-latest
@@ -56,7 +66,7 @@ jobs:
         API_URI: http://${{ secrets.DEPLOY_HOST }}:8000
         LLM_API_KEY: ${{ secrets.LLM_API_KEY }}
       with:
-          name: arquisoft/wichat_0/webapp
+          name: arquisoft/wichat_es4c/webapp
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
@@ -76,7 +86,7 @@ jobs:
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-          name: arquisoft/wichat_0/authservice
+          name: arquisoft/wichat_es4c/authservice
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: ghcr.io
@@ -95,7 +105,7 @@ jobs:
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-        name: arquisoft/wichat_0/userservice
+        name: arquisoft/wichat_es4c/userservice
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
@@ -113,7 +123,7 @@ jobs:
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-        name: arquisoft/wichat_0/llmservice
+        name: arquisoft/wichat_es4c/llmservice
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
@@ -135,23 +145,24 @@ jobs:
     - name: Publish to Registry
       uses: elgohr/Publish-Docker-Github-Action@v5
       with:
-        name: arquisoft/wichat_0/gatewayservice
+        name: arquisoft/wichat_es4c/gatewayservice
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
         workdir: gatewayservice
-  deploy:
-    name: Deploy over SSH
-    runs-on: ubuntu-latest
-    needs: [docker-push-userservice,docker-push-authservice,docker-push-llmservice,docker-push-gatewayservice,docker-push-webapp]
-    steps:
-    - name: Deploy over SSH
-      uses: fifsky/ssh-action@master
-      with:
-        host: ${{ secrets.DEPLOY_HOST }}
-        user: ${{ secrets.DEPLOY_USER }}
-        key: ${{ secrets.DEPLOY_KEY }}
-        command: |
-          wget https://raw.githubusercontent.com/arquisoft/wichat_0/master/docker-compose.yml -O docker-compose.yml
-          docker compose --profile prod down
-          docker compose --profile prod up -d --pull always
+  # deploy:
+  #   name: Deploy over SSH
+  #   runs-on: ubuntu-latest
+  #   needs: [docker-push-userservice,docker-push-authservice,docker-push-llmservice,docker-push-gatewayservice,docker-push-webapp]
+  #   steps:
+  #   - name: Deploy over SSH
+  #     uses: fifsky/ssh-action@master
+  #     with:
+  #       host: ${{ secrets.DEPLOY_HOST }}
+  #       user: ${{ secrets.DEPLOY_USER }}
+  #       key: ${{ secrets.DEPLOY_KEY }}
+  #       command: |
+  #         wget https://raw.githubusercontent.com/arquisoft/wichat_es4c/master/docker-compose.yml -O docker-compose.yml
+  #         docker compose --profile prod down
+  #         docker compose --profile prod up -d --pull always
+

.gitignore

@@ -2,4 +2,4 @@ node_modules
 coverage
 docs/build
 .env
-webapp/.env
+webapp/*.env

README.md

@@ -1,8 +1,8 @@
-# wichat_0
+# wichat_es4c
 
-[![Actions Status](https://github.com/arquisoft/wichat_0/workflows/CI%20for%20wichat_0/badge.svg)](https://github.com/arquisoft/wichat_0/actions)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wichat_0&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wichat_0)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wichat_0&metric=coverage)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wichat_0)
+[![Actions Status](https://github.com/arquisoft/wichat_es4c/workflows/CI%20for%20wichat_es4c/badge.svg)](https://github.com/arquisoft/wichat_es4c/actions)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wichat_es4c&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wichat_es4c)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Arquisoft_wichat_es4c&metric=coverage)](https://sonarcloud.io/summary/new_code?id=Arquisoft_wichat_es4c)
 
 <p float="left">
 <img src="https://blog.wildix.com/wp-content/uploads/2020/06/react-logo.jpg" height="100">
@@ -23,7 +23,7 @@ Both the user and auth service share a Mongo database that is accessed with mong
 
 First, clone the project:
 
-```git clone [email protected]:arquisoft/wichat_0.git```
+```git clone [email protected]:arquisoft/wichat_es4c.git```
 
 ### LLM API key configuration
 
@@ -55,7 +55,7 @@ First, start the database. Either install and run Mongo or run it using docker:
 
 You can use also services like Mongo Altas for running a Mongo database in the cloud.
 
-Now launch the auth, user and gateway services. Just go to each directory and run `npm install` followed by `npm start`.
+Now launch the auth, user, question and gateway services. Just go to each directory and run `npm install` followed by `npm start`.
 
 Lastly, go to the webapp directory and launch this component with `npm install` followed by `npm start`.
 
@@ -106,7 +106,7 @@ deploy:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          wget https://raw.githubusercontent.com/arquisoft/wichat_0/master/docker-compose.yml -O docker-compose.yml
+          wget https://raw.githubusercontent.com/arquisoft/wichat_es4c/master/docker-compose.yml -O docker-compose.yml
           docker compose --profile prod down
           docker compose --profile prod up -d --pull always
 ```

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mongodb:
-    container_name: mongodb-wichat_0
+    container_name: mongodb-wichat_es4c
     image: mongo
     profiles: ["dev", "prod"]
     volumes:
@@ -11,8 +11,8 @@ services:
       - mynetwork
 
   authservice:
-    container_name: authservice-wichat_0
-    image: ghcr.io/arquisoft/wichat_0/authservice:latest
+    container_name: authservice-wichat_es4c
+    image: ghcr.io/arquisoft/wichat_es4c/authservice:latest
     profiles: ["dev", "prod"]
     build: ./users/authservice
     depends_on:
@@ -25,8 +25,8 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
   userservice:
-    container_name: userservice-wichat_0
-    image: ghcr.io/arquisoft/wichat_0/userservice:latest
+    container_name: userservice-wichat_es4c
+    image: ghcr.io/arquisoft/wichat_es4c/userservice:latest
     profiles: ["dev", "prod"]
     build: ./users/userservice
     depends_on:
@@ -39,25 +39,37 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/userdb
 
   llmservice:
-    container_name: llmservice-wichat_0
-    image: ghcr.io/arquisoft/wichat_0/llmservice:latest
+    container_name: llmservice-wichat_es4c
+    image: ghcr.io/arquisoft/wichat_es4c/llmservice:latest
     profiles: ["dev", "prod"]
     build: ./llmservice
     ports:
       - "8003:8003"
     networks:
       - mynetwork
 
+  questionservice:
+    container_name: questionservice-wichat_es4c
+    image: ghcr.io/arquisoft/wichat_es4c/questionservice:latest
+    profiles: ["dev", "prod"]
+    build: ./questionservice
+    ports:
+      - "8004:8004"
+    networks:
+      - mynetwork
+
+
   gatewayservice:
-    container_name: gatewayservice-wichat_0
-    image: ghcr.io/arquisoft/wichat_0/gatewayservice:latest
+    container_name: gatewayservice-wichat_es4c
+    image: ghcr.io/arquisoft/wichat_es4c/gatewayservice:latest
     profiles: ["dev", "prod"]
     build: ./gatewayservice
     depends_on:
       - mongodb
       - userservice
       - authservice
       - llmservice
+      - questionservice
     ports:
       - "8000:8000"
     networks:
@@ -66,10 +78,11 @@ services:
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
       LLM_SERVICE_URL: http://llmservice:8003
+      QUESTION_SERVICE_URL: http://questionservice:8004
 
   webapp:
-    container_name: webapp-wichat_0
-    image: ghcr.io/arquisoft/wichat_0/webapp:latest
+    container_name: webapp-wichat_es4c
+    image: ghcr.io/arquisoft/wichat_es4c/webapp:latest
     profiles: ["dev", "prod"]
     build: 
       context: ./webapp
@@ -82,7 +95,7 @@ services:
 
   prometheus:
     image: prom/prometheus
-    container_name: prometheus-wichat_0
+    container_name: prometheus-wichat_es4c
     profiles: ["dev"]
     networks:
       - mynetwork
@@ -96,7 +109,7 @@ services:
 
   grafana:
     image: grafana/grafana
-    container_name: grafana-wichat_0
+    container_name: grafana-wichat_es4c
     profiles: ["dev"]
     networks:
       - mynetwork

docs/README.md

@@ -1,6 +1,6 @@
 ## The documentation
 In this project, the documentation is compiled locally and deployed to GitHub pages.
-The deployment url is: [https://arquisoft.github.io/wichat_0/](https://arquisoft.github.io/wichat_0/).
+The deployment url is: [https://arquisoft.github.io/wichat_es4c/](https://arquisoft.github.io/wichat_es4c/).
 
 ### Documentation build
 For the documentation, we are going to use [AsciiDoc](https://asciidoc.org/) and [PlantUML](https://plantuml.com) and follow the [Arc42](https://github.com/arc42/arc42-template) template. If you want to be able to generate the doc locally you need to install Ruby, Java and some dependencies to translate the AsciiDoc code into html. If you are in Linux you can install Ruby and Java simply by executing:
@@ -30,6 +30,6 @@ npm run build
 The documentation will be generated under the `docs/build` directory. 
 
 ### Documentation deployment
-If we want to deploy it to GitHub pages, so it is accessible via [https://arquisoft.github.io/wichat_0/](https://arquisoft.github.io/wichat_0/), we need to execute `npm run deploy`.
+If we want to deploy it to GitHub pages, so it is accessible via [https://arquisoft.github.io/wichat_es4c/](https://arquisoft.github.io/wichat_es4c/), we need to execute `npm run deploy`.
 
 If you check the `package.json` in this directory you can see how deploying is as easy as executing `gh-pages -d build`, which can be directly executed using `npm run deploy` in the docs directory. The `gh-pages` package is in charge of pushing the documentation generated directory (basically some htmls) to a special github branch called gh-pages. Everything pushed to this branch is accessible on the repository page. Note that we only want to push there the documentation. Also is important that the documentation build is not pushed to the other branches of the project.

docs/index.adoc

@@ -6,7 +6,7 @@
 // configure EN settings for asciidoc
 include::src/config.adoc[]
 
-= image:arc42-logo.png[arc42] wichat_0
+= image:arc42-logo.png[arc42] wichat_es4c
 :revnumber: 8.2 EN
 :revdate: January 2023
 :revremark: (based upon AsciiDoc version)