chore: add differ infrastructure config

.circleci/config.differ.yml

@@ -0,0 +1,62 @@
+version: 2
+branches:
+  ignore:
+    - gh-pages
+jobs:
+  build:
+    docker:
+      - image: labsai/ci-build
+      - environment:
+          ACCT_AUTH: ${ACCT_AUTH}
+          APP_NAME: differ-bot-eddi
+          DOCKER_IMAGE: eu.gcr.io/differ-140008/etf-service-eddi
+          PROJECT_NAME: differ-140008
+          CLUSTER_NAME: differ-dev
+          CLOUDSDK_COMPUTE_ZONE: europe-west1-d
+    working_directory: ~/eddi
+    steps:
+      - checkout
+      - setup_remote_docker
+
+      - restore_cache:
+          key: eddi
+          paths:
+            - /root/.m2
+
+      - run: ./tools/ensure-gcloud-installed.sh
+
+      - run: ./tools/ensure-helm-installed.sh
+
+      - run: mvn clean package
+
+      - run: mkdir -p $CIRCLE_TEST_REPORTS/junit/
+      - run: find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+
+      - save_cache:
+          key: eddi
+          paths:
+            - /root/.m2
+
+      - run:
+          name: Start container and verify it's working
+          command: |
+            set -x
+            chmod +x integration-tests.sh
+            ./integration-tests.sh
+
+      - deploy:
+          name: Build and push Docker image
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+
+            # todo: get version dynamically?
+            export version=4.0.1
+
+            sudo /opt/google-cloud-sdk/bin/gcloud docker build -t $DOCKER_IMAGE:$version-$CIRCLE_BUILD_NUM .
+            sudo /opt/google-cloud-sdk/bin/gcloud docker build -t $DOCKER_IMAGE:latest .
+
+            sudo /opt/google-cloud-sdk/bin/gcloud docker push $DOCKER_IMAGE:$version-$CIRCLE_BUILD_NUM
+            sudo /opt/google-cloud-sdk/bin/gcloud docker push $DOCKER_IMAGE:latest
+
+            sudo helm upgrade $APP_NAME charts/$APP_NAME --set image.tag=$version-$IMAGE_TAG --install
+            fi

.circleci/config.yml

@@ -39,18 +39,9 @@ jobs:
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
             docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-            docker build -t labsai/eddi:4.1.0-b$CIRCLE_BUILD_NUM .
-            docker push labsai/eddi:4.1.0-b$CIRCLE_BUILD_NUM
+            docker build -t labsai/eddi:4.0.1-b$CIRCLE_BUILD_NUM .
+            docker push labsai/eddi:4.0.1-b$CIRCLE_BUILD_NUM
 
             docker build -t labsai/eddi:latest .
             docker push labsai/eddi:latest
-
-            # docker build -t labsai/eddi:4.1.0 .
-            # docker push labsai/eddi:4.1.0
-
-            # docker build -t labsai/eddi:4.1 .
-            # docker push labsai/eddi:4.1
-
-            # docker build -t labsai/eddi:4 .
-            # docker push labsai/eddi:4
             fi

.gitignore

@@ -5,3 +5,6 @@
 # ignore intellij files
 .idea/
 *.iml
+
+charts/eddi/charts
+charts/eddi/requirements.lock

apiserver/config/development/systemRuntime.properties

@@ -1,5 +1,5 @@
 systemRuntime.projectName=eddi
-systemRuntime.projectVersion=4.1.0
+systemRuntime.projectVersion=4.0.1
 systemRuntime.configDir=config/development
 systemRuntime.resourceDir=resources
 systemRuntime.logDir=logs

apiserver/pom.xml

@@ -175,11 +175,6 @@
             <artifactId>semanticparser-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>ai.labs</groupId>
-            <artifactId>outputgeneration-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>ai.labs</groupId>
             <artifactId>caching-impl-infinispan</artifactId>

apiserver/src/main/java/ai/labs/api/ApiServer.java

@@ -8,7 +8,6 @@
 import ai.labs.facebookmessenger.bootstrap.FacebookMessengerModule;
 import ai.labs.httpclient.guice.HttpClientModule;
 import ai.labs.memory.bootstrap.ConversationMemoryModule;
-import ai.labs.output.bootstrap.OutputGenerationModule;
 import ai.labs.parser.bootstrap.SemanticParserModule;
 import ai.labs.permission.bootstrap.PermissionModule;
 import ai.labs.persistence.bootstrap.PersistenceModule;
@@ -61,7 +60,6 @@ public static void main(String[] args) throws Exception {
                 new UserModule(),
                 new CachingModule(new FileInputStream(configDir + "infinispan.xml")),
                 new SemanticParserModule(),
-                new OutputGenerationModule(),
                 new AutomatedtestingModule(),
                 new StaticResourcesModule(),
                 new HttpClientModule(),

apiserver/src/main/resources/css/chat.css

@@ -65,30 +65,6 @@ body {
     opacity: 0;
 }
 
-.messages .quick_reply {
-    position: relative;
-    clear: both;
-    overflow: hidden;
-    transition: all 0.5s linear;
-    opacity: 0;
-    background-color: #ffe6cb;
-    color: #c48843;
-    border: 2px dashed #c48843;
-    padding: 15px 32px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    font-size: 16px;
-    border-radius: 6px;
-    cursor: pointer;
-    box-shadow: 2px 2px gray;
-    margin: 5px;
-}
-
-.messages .quick_reply.appeared {
-    opacity: 1;
-}
-
 .typing {
     background-color: #8c8c8c;
     font-weight: bolder;