Merge remote-tracking branch 'origin/dev' into config

Author: JWittmeyer

.drone.yml

@@ -43,13 +43,11 @@ steps:
     image: appleboy/drone-ssh
     failure: ignore
     settings:
-      host: app.legacy.kern.ai
+      host: app.dev.kern.ai
       username:
-        from_secret: ssh_user
+        from_secret: dev_cognition_ssh_user
       key:
-        from_secret: ssh_key
-      ssh_passphrase:
-        from_secret: ssh_passphrase
+        from_secret: dev_cognition_ssh_key
       script:
         - /bin/sh ./trigger_dev_deployment.sh
 

.github/workflows/dc_deploy.yml

@@ -0,0 +1,22 @@
+name: 'DC: Prepare Deployment' # rename
+
+on:
+  # workflow_dispatch:
+  release:
+    types: [prereleased]
+  pull_request:
+    branches:
+      - dev
+    types: [closed]
+
+# Special permissions required for OIDC authentication
+permissions:
+  id-token: write
+  contents: read
+  actions: read
+
+jobs:
+  call-dc-release:
+    uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/dc_release.yml@dev
+    if: github.event_name == 'pull_request' && github.event.pull_request.merged || github.event_name == 'release'
+    secrets: inherit

Dockerfile

@@ -1,4 +1,4 @@
-FROM kernai/refinery-parent-images:v1.19.0-next
+FROM kernai/refinery-parent-images:v1.20.0-next
 
 WORKDIR /app
 COPY package*.json /app/

dev.Dockerfile

@@ -1,4 +1,4 @@
-FROM kernai/refinery-parent-images:v1.19.0-next
+FROM kernai/refinery-parent-images:v1.20.0-next
 
 WORKDIR /app
 

package.json

@@ -22,7 +22,6 @@
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "autoprefixer": "^10.4.19",
-    "aws-sdk": "^2.1653.0",
     "chart.js": "^4.4.3",
     "clsx": "^1.2.1",
     "d3": "^7.8.5",
@@ -42,7 +41,10 @@
     "react-router-dom": "^6.10.0",
     "rxjs": "^7.8.1",
     "tailwindcss": "^3.4.4",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.3",
+    "@aws-sdk/client-s3": "^3.685.0",
+    "i18next": "^23.11.5",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.15",

src/components/projects/projectId/attributes/attributeId/AttributeCalculations.tsx

@@ -24,7 +24,6 @@ import { TOOLTIPS_DICT } from "@/src/util/tooltip-constants";
 import { selectAllUsers, selectOrganizationId, setComments } from "@/src/reduxStore/states/general";
 import { CommentDataManager } from "@/src/util/classes/comments";
 import { CommentType } from "@/src/types/shared/comments";
-import BricksIntegrator from "@/src/components/shared/bricks-integrator/BricksIntegrator";
 import { AttributeCodeLookup } from "@/src/util/classes/attribute-calculation";
 import KernDropdown from "@/submodules/react-components/components/KernDropdown";
 import { useWebsocket } from "@/submodules/react-components/hooks/web-socket/useWebsocket";
@@ -35,6 +34,7 @@ import { getLookupListsByProjectId } from "@/src/services/base/lookup-lists";
 import { getLabelingTasksByProjectId, getProjectTokenization } from "@/src/services/base/project";
 import { getAttributeByAttributeId, updateAttribute } from "@/src/services/base/project-setting";
 import { Application, CurrentPage } from "@/submodules/react-components/hooks/web-socket/constants";
+import { VisitBricksButton } from "@/src/components/shared/bricks/VisitBricksButton";
 
 const EDITOR_OPTIONS = { theme: 'vs-light', language: 'python', readOnly: false };
 
@@ -53,18 +53,13 @@ export default function AttributeCalculation() {
     const [isNameOpen, setIsNameOpen] = useState(false);
     const [duplicateNameExists, setDuplicateNameExists] = useState(false);
     const [tooltipsArray, setTooltipsArray] = useState<string[]>([]);
-    const [isInitial, setIsInitial] = useState(null);  //null as add state to differentiate between initial, not and unchecked
     const [editorOptions, setEditorOptions] = useState(EDITOR_OPTIONS);
     const [tokenizationProgress, setTokenizationProgress] = useState(0);
     const [editorValue, setEditorValue] = useState('');
     const [attributeName, setAttributeName] = useState('');
     const [checkUnsavedChanges, setCheckUnsavedChanges] = useState(false);
     const [enableRunButton, setEnableButton] = useState(false);
 
-    useEffect(() => {
-        if (!currentAttribute) return;
-        if (isInitial == null) setIsInitial(AttributeCodeLookup.isCodeStillTemplate(currentAttribute.sourceCode, currentAttribute.dataType))
-    }, [currentAttribute]);
 
     useEffect(() => {
         if (!projectId) return;
@@ -202,9 +197,6 @@ export default function AttributeCalculation() {
         }, attributeNew.dataType);
     }
 
-    function openBricksIntegrator() {
-        document.getElementById('bricks-integrator-open-button').click();
-    }
 
     function onScrollEvent(event: any) {
         if (!(event.target instanceof HTMLElement)) return;
@@ -233,13 +225,6 @@ export default function AttributeCalculation() {
         });
     }
 
-    function updateNameAndCodeBricksIntegrator(code: string) {
-        setEditorValue(code);
-        const regMatch: any = getPythonFunctionRegExMatch(code);
-        updateSourceCode(code, regMatch[2]);
-        setIsInitial(false);
-    }
-
     function refetchLabelingTasksAndProcess() {
         getLabelingTasksByProjectId(projectId, (res) => {
             const labelingTasks = postProcessLabelingTasks(res['data']['projectByProjectId']['labelingTasks']['edges']);
@@ -368,13 +353,7 @@ export default function AttributeCalculation() {
                 <div className="flex flex-row items-center justify-between my-3">
                     <div className="text-sm leading-5 font-medium text-gray-700 inline-block mr-2">Editor</div>
                     <div className="flex flex-row flex-nowrap">
-                        <BricksIntegrator
-                            moduleTypeFilter="generator,classifier" functionType="Attribute"
-                            nameLookups={attributes.map(a => a.name)}
-                            preparedCode={(code: string) => {
-                                if (currentAttribute.state == AttributeState.USABLE) return;
-                                updateNameAndCodeBricksIntegrator(code);
-                            }} />
+                        <VisitBricksButton urlExtension="generators" tooltipPlacement="left" size="small" />
                         <Tooltip content={TOOLTIPS_DICT.ATTRIBUTE_CALCULATION.AVAILABLE_LIBRARIES} placement="bottom" color="invert">
                             <a href="https://github.com/code-kern-ai/refinery-ac-exec-env/blob/dev/requirements.txt"
                                 target="_blank"
@@ -386,19 +365,6 @@ export default function AttributeCalculation() {
                 </div>
 
                 <div className="border mt-1 relative">
-                    {isInitial && <div
-                        className="absolute top-0 bottom-0 left-0 right-0 bg-gray-200 flex items-center justify-center z-10" style={{ opacity: '0.9' }}>
-                        <div className="flex flex-col gap-2">
-                            <button onClick={openBricksIntegrator}
-                                className="bg-white text-gray-900 text font-semibold px-4 py-2 rounded-md border border-gray-300 hover:bg-gray-50 focus:outline-none">
-                                Search in bricks
-                            </button>
-                            <button onClick={() => setIsInitial(false)}
-                                className="bg-white text-gray-900 text font-semibold px-4 py-2 rounded-md border border-gray-300 hover:bg-gray-50 focus:outline-none">
-                                Start from scratch
-                            </button>
-                        </div>
-                    </div>}
                     <Editor
                         height="400px"
                         defaultLanguage={'python'}

src/components/projects/projectId/heuristics/HeuristicsOverview.tsx

@@ -14,8 +14,7 @@ import AddActiveLeanerModal from "./modals/AddActiveLearnerModal";
 import { postProcessingEmbeddings } from "@/src/util/components/projects/projectId/settings/embeddings-helper";
 import { CommentType } from "@/src/types/shared/comments";
 import { CommentDataManager } from "@/src/util/classes/comments";
-import { selectAllUsers, selectOrganizationId, setBricksIntegrator, setComments } from "@/src/reduxStore/states/general";
-import { getEmptyBricksIntegratorConfig } from "@/src/util/shared/bricks-integrator-helper";
+import { selectAllUsers, selectOrganizationId, setComments } from "@/src/reduxStore/states/general";
 import { useWebsocket } from "@/submodules/react-components/hooks/web-socket/useWebsocket";
 import { getAllComments } from "@/src/services/base/comment";
 import { getAttributes } from "@/src/services/base/attribute";
@@ -48,7 +47,6 @@ export function HeuristicsOverview() {
                 dispatch(setAllAttributes(res.data['attributesByProjectId']));
             });
         }
-        dispatch(setBricksIntegrator(getEmptyBricksIntegratorConfig()));
     }, [projectId]);
 
     useEffect(() => {

src/components/projects/projectId/heuristics/heuristicId/active-learning/ActiveLearning.tsx

@@ -21,10 +21,9 @@ import HeuristicStatistics from "../shared/HeuristicStatistics";
 import DangerZone from "@/src/components/shared/danger-zone/DangerZone";
 import { DangerZoneEnum } from "@/src/types/shared/danger-zone";
 import { getPythonClassName, getPythonClassRegExMatch } from "@/submodules/javascript-functions/python-functions-parser";
-import { selectAllUsers, setBricksIntegrator, setLabelsBricksIntegrator, setComments, selectOrganizationId } from "@/src/reduxStore/states/general";
+import { selectAllUsers, setComments, selectOrganizationId } from "@/src/reduxStore/states/general";
 import { CommentType } from "@/src/types/shared/comments";
 import { CommentDataManager } from "@/src/util/classes/comments";
-import BricksIntegrator from "@/src/components/shared/bricks-integrator/BricksIntegrator";
 import { InformationSourceCodeLookup, InformationSourceExamples } from "@/src/util/classes/heuristics";
 import { getInformationSourceTemplate } from "@/src/util/components/projects/projectId/heuristics/heuristics-helper";
 import KernDropdown from "@/submodules/react-components/components/KernDropdown";
@@ -35,6 +34,7 @@ import { getLabelingTasksByProjectId } from "@/src/services/base/project";
 import { getHeuristicByHeuristicId, getPayloadByPayloadId, updateHeuristicPost } from "@/src/services/base/heuristic";
 import { getEmbeddings } from "@/src/services/base/embedding";
 import { Application, CurrentPage } from "@/submodules/react-components/hooks/web-socket/constants";
+import { VisitBricksButton } from "@/src/components/shared/bricks/VisitBricksButton";
 
 export default function ActiveLearning() {
     const dispatch = useDispatch();
@@ -49,7 +49,6 @@ export default function ActiveLearning() {
     const allUsers = useSelector(selectAllUsers);
 
     const [lastTaskLogs, setLastTaskLogs] = useState<string[]>([]);
-    const [isInitialAL, setIsInitialAL] = useState<boolean>(null);  //null as add state to differentiate between initial, not and unchecked
     const [checkUnsavedChanges, setCheckUnsavedChanges] = useState(false);
 
     useEffect(() => {
@@ -71,8 +70,6 @@ export default function ActiveLearning() {
         if (!embeddings) return;
         dispatch(setFilteredEmbeddings(embeddings.filter(e => embeddingRelevant(e, attributes, labelingTasks, currentHeuristic.labelingTaskId))));
         refetchTaskByTaskIdAndProcess();
-        if (isInitialAL == null) setIsInitialAL(InformationSourceCodeLookup.isCodeStillTemplate(currentHeuristic.sourceCode.replace(embeddingsFiltered[0]?.name, '@@EMBEDDING@@')) != null)
-
     }, [currentHeuristic]);
 
     useEffect(() => {
@@ -255,23 +252,11 @@ export default function ActiveLearning() {
                         )}
                     </div>
                     <div className="flex flex-row flex-nowrap items-center ml-auto">
-                        <BricksIntegrator
-                            moduleTypeFilter={currentHeuristic.labelingTaskType == 'MULTICLASS_CLASSIFICATION' ? 'classifier' : 'extractor'}
-                            executionTypeFilter="activeLearner"
-                            functionType="Heuristic"
-                            labelingTaskId={currentHeuristic.labelingTaskId}
-                            preparedCode={(code: string) => {
-                                updateSourceCode(code);
-                                setIsInitialAL(false);
-                            }}
-                            newTaskId={(value) => setValueToLabelingTask(value)}
-                        />
+                        <VisitBricksButton tooltipPlacement="left" size="small" />
                     </div>
                 </div>
                 <HeuristicsEditor
-                    isInitial={isInitialAL}
                     updatedSourceCode={(code: string) => updateSourceCode(code)}
-                    setIsInitial={(val) => setIsInitialAL(val)}
                     setCheckUnsavedChanges={(val) => setCheckUnsavedChanges(val)}
                 />