Merge pull request #542 from deeppavlov/dev

Release v1.9.0
deeppavlov · Aug 3, 2023 · eed244e · eed244e
2 parents fa72dc6 + e79e710
commit eed244e
Show file tree

Hide file tree

Showing 362 changed files with 16,634 additions and 625 deletions.
diff --git a/.env b/.env
@@ -32,5 +32,4 @@ INFILLING_SERVICE_URL=http://infilling:8106/respond
 DIALOGPT_CONTINUE_SERVICE_URL=http://dialogpt:8125/continue
 PROMPT_STORYGPT_SERVICE_URL=http://prompt-storygpt:8127/respond
 STORYGPT_SERVICE_URL=http://storygpt:8126/respond
-SENTENCE_RANKER_SERVICE_URL=http://sentence-ranker:8128/respond
 FILE_SERVER_URL=http://files:3000
diff --git a/.env_ru b/.env_ru
@@ -21,4 +21,3 @@ BADLIST_ANNOTATOR_URL=http://badlisted-words-ru:8018/badlisted_words_batch
 DP_WIKIDATA_URL=http://wiki-parser-ru:8077/model
 DP_ENTITY_LINKING_URL=http://entity-linking-ru:8075/model
 FILE_SERVER_URL=http://files:3000
-SENTENCE_RANKER_SERVICE_URL=http://dialogrpt-ru:8122/rank_sentences
diff --git a/.gitignore b/.gitignore
@@ -145,3 +145,4 @@ docker-compose-one-replica.yml
 
 # personal env keys and tokens
 *.env_secret
+*.env_secret_ru
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,6 +33,98 @@ pipeline {
         }
       }
     }
+// ------------------------------------------- Test prompted dists------------------------------------------------
+    stage('Build-DRUXGLM') {
+      steps {
+        script{
+          startTime = currentBuild.duration
+          Exception ex = null
+          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            try {
+              sh '''
+                cat /home/ignatov/secrets.txt >> .env_secret
+                tests/runtests_dream_ruxglm.sh MODE=build
+              '''
+            }
+            catch (Exception e) {
+              int duration = (currentBuild.duration - startTime) / 1000
+              throw e
+            }
+          }
+        }
+      }
+      post {
+        aborted {
+          script {
+            sh 'tests/runtests_dream_ruxglm.sh MODE=clean'
+          }
+        }
+        success {
+          script {
+            int duration = (currentBuild.duration - startTime) / 1000
+          }
+        }
+      }
+    }
+    stage('Start-DRUXGLM') {
+      steps {
+        script {
+          startTime = currentBuild.duration
+          Exception ex = null
+          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            try {
+              sh 'tests/runtests_dream_ruxglm.sh MODE=clean && tests/runtests_dream_ruxglm.sh MODE=start'
+            }
+            catch (Exception e) {
+              int duration = (currentBuild.duration - startTime) / 1000
+              throw e
+            }
+          }
+        }
+      }
+      post {
+        success {
+          script {
+            started = true
+            int duration = (currentBuild.duration - startTime) / 1000
+          }
+        }
+        aborted {
+          script {
+            sh 'tests/runtests_dream_ruxglm.sh MODE=clean'
+          }
+        }
+      }
+    }
+    stage('Test skills-DRUXGLM') {
+      steps {
+        script {
+          startTime = currentBuild.duration
+          Exception ex = null
+          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            try {
+              sh label: 'test skills', script: 'tests/runtests_dream_ruxglm.sh MODE=test_skills'
+            }
+            catch (Exception e) {
+              int duration = (currentBuild.duration - startTime) / 1000
+              throw e
+            }
+          }
+        }
+      }
+      post {
+        success {
+          script {
+            int duration = (currentBuild.duration - startTime) / 1000
+          }
+        }
+        aborted {
+          script {
+            sh 'tests/runtests_dream_ruxglm.sh MODE=clean'
+          }
+        }
+      }
+    }
 // ------------------------------------------- Test prompted dists------------------------------------------------
     stage('Build-Reason') {
       steps {
@@ -43,6 +135,7 @@ pipeline {
             try {
               sh '''
                 cat /home/ignatov/secrets.txt >> .env_secret
+                tests/runtests_dream_ruxglm.sh MODE=clean
                 tests/runtests_reasoning.sh MODE=build
               '''
             }
@@ -405,7 +498,7 @@ pipeline {
       }
     }
 // ------------------------------------------- Test prompted dists------------------------------------------------
-    stage('Build-NOASST') {
+    stage('Build-JRUGPT') {
       steps {
         script{
           startTime = currentBuild.duration
@@ -415,7 +508,7 @@ pipeline {
               sh '''
                 cat /home/ignatov/secrets.txt >> .env_secret
                 tests/runtests_deeppavlov_chatgpt.sh MODE=clean
-                tests/runtests_nutrition_oasst.sh MODE=build
+                tests/runtests_journalist_rugpt35.sh MODE=build
               '''
             }
             catch (Exception e) {
@@ -428,7 +521,7 @@ pipeline {
       post {
         aborted {
           script {
-            sh 'tests/runtests_nutrition_oasst.sh MODE=clean'
+            sh 'tests/runtests_journalist_rugpt35.sh MODE=clean'
           }
         }
         success {
@@ -438,14 +531,14 @@ pipeline {
         }
       }
     }
-    stage('Start-NOASST') {
+    stage('Start-JRUGPT') {
       steps {
         script {
           startTime = currentBuild.duration
           Exception ex = null
           catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
             try {
-              sh 'tests/runtests_nutrition_oasst.sh MODE=clean && tests/runtests_nutrition_oasst.sh MODE=start'
+              sh 'tests/runtests_journalist_rugpt35.sh MODE=clean && tests/runtests_journalist_rugpt35.sh MODE=start'
             }
             catch (Exception e) {
               int duration = (currentBuild.duration - startTime) / 1000
@@ -463,19 +556,19 @@ pipeline {
         }
         aborted {
           script {
-            sh 'tests/runtests_nutrition_oasst.sh MODE=clean'
+            sh 'tests/runtests_journalist_rugpt35.sh MODE=clean'
           }
         }
       }
     }
-    stage('Test skills-NOASST') {
+    stage('Test skills-JRUGPT') {
       steps {
         script {
           startTime = currentBuild.duration
           Exception ex = null
           catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
             try {
-              sh label: 'test skills', script: 'tests/runtests_nutrition_oasst.sh MODE=test_skills'
+              sh label: 'test skills', script: 'tests/runtests_journalist_rugpt35.sh MODE=test_skills'
             }
             catch (Exception e) {
               int duration = (currentBuild.duration - startTime) / 1000
@@ -492,7 +585,7 @@ pipeline {
         }
         aborted {
           script {
-            sh 'tests/runtests_nutrition_oasst.sh MODE=clean'
+            sh 'tests/runtests_journalist_rugpt35.sh MODE=clean'
           }
         }
       }
@@ -507,7 +600,7 @@ pipeline {
             try {
               sh '''
                 cat /home/ignatov/secrets.txt >> .env
-                tests/runtests_nutrition_oasst.sh MODE=clean
+                tests/runtests_journalist_rugpt35.sh MODE=clean
                 tests/runtests_document_based.sh MODE=build
               '''
             }
@@ -822,7 +915,7 @@ pipeline {
         if (started) {
           sh './tests/runtests_multiskill_davinci3.sh MODE=clean'
           sh './tests/runtests_marketing_gptjt.sh MODE=clean'
-          sh './tests/runtests_nutrition_oasst.sh MODE=clean'
+          sh './tests/runtests_journalist_rugpt35.sh MODE=clean'
           sh './tests/runtests_deeppavlov_chatgpt.sh MODE=clean'
           sh './tests/runtests.sh MODE=clean'
           sh './tests/runtests_russian.sh MODE=clean'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,3 +145,4 @@ docker-compose-one-replica.yml

		# personal env keys and tokens
		*.env_secret
		*.env_secret_ru