Tests: Update to run containers

libraries/bio/src/pdb/auto-dock-service.ts

@@ -52,8 +52,6 @@ export interface IAutoDockService {
 
   awaitStatus(targetStatus: DockerContainerStatus, timeout?: number): Promise<void>;
 
-  healthCheck(): Promise<void>;
-
   checkOpenCl(): Promise<number>;
 
   /**

packages/Admetica/dockerfiles/Admetica.py

@@ -200,16 +200,5 @@ def admetica_predict():
       "result": None
     }), 500
 
-@app.route('/health_check', methods=['GET'])
-def health_check():
-  try:
-    return jsonify({"success": True, "error": None, "result": "Service is up and running"}), 200
-  except Exception as e:
-    return jsonify({
-      "success": False,
-      "error": str(e),
-      "result": None
-    }), 500
-
 if __name__ == '__main__':
   app.run(host='0.0.0.0', port=6678, debug=False)

packages/Admetica/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@datagrok-libraries/tutorials": "^1.5.2",
-    "@datagrok-libraries/utils": "../../libraries/utils",
+    "@datagrok-libraries/utils": "^4.4.0",
     "cash-dom": "^8.1.5",
     "datagrok-api": "^1.23.0",
     "dayjs": "=1.11.10"

packages/Admetica/src/tests/admetica-tests.ts

@@ -19,14 +19,8 @@ category('Admetica', () => {
     if (!admeticaContainer)
       admeticaContainer = await grok.dapi.docker.dockerContainers.filter('admetica').first();
 
-    const healthCheckPromise = admeticaContainer.status !== 'started'
-      ? [
-        grok.dapi.docker.dockerContainers.fetchProxy(admeticaContainer.id, '/health_check', { method: 'GET' }),
-        awaitStatus(admeticaContainer.id, 'started', 90000, _package.logger)
-      ]
-      : [];
-
-    await Promise.all([...healthCheckPromise]);
+    if (!admeticaContainer.status.startsWith('started'))
+      await grok.dapi.docker.dockerContainers.run(admeticaContainer.id, true);
     await setProperties();
   });
 

packages/Chem/dockerfiles/chem/app.py

@@ -77,10 +77,6 @@ def chem_inchi_to_smiles():
     result = parallelize(inchi_to_smiles, [inchi], [inchi], Settings.num_cores)
     return _make_response(json.dumps(result), headers=headers_app_json)
 
-@bp.route('/chem/health_check', methods=['GET'])
-def health_check():
-    return jsonify({"success": True, "error": None, "result": "Service is up and running"}), 200
-
 def _make_response(data, headers=None):
     response = Response(data)
     response.headers = {

packages/Chem/dockerfiles/chemprop/grok_compute.py

@@ -123,10 +123,6 @@ def modeling_models():
     # All models status
     return _make_response(None)
 
-@bp.route('/modeling/health_check', methods=['GET'])
-def health_check():
-    return jsonify({"success": True, "error": None, "result": "Service is up and running"}), 200
-
 def _make_response(data, headers=None):
     response = Response(data)
     response.headers = {

packages/Chem/package.json

@@ -43,7 +43,7 @@
     "@datagrok-libraries/ml": "^6.7.6",
     "@datagrok-libraries/math": "^1.2.5",
     "@datagrok-libraries/tutorials": "^1.4.2",
-    "@datagrok-libraries/utils": "../../libraries/utils",
+    "@datagrok-libraries/utils": "^4.4.0",
     "@types/pako": "^2.0.3",
     "typescript-lru-cache": "^2.0.0",
     "cash-dom": "^8.1.5",

packages/Chem/src/tests/ui-tests-top-menu.ts

@@ -22,21 +22,11 @@ category('UI top menu', () => {
       grok.dapi.docker.dockerContainers.filter('name = "chem-chem"').first()
     ]);
 
-    await Promise.all([
-      ...(chemContainer.status !== 'started'
-        ? [
-            grok.dapi.docker.dockerContainers.fetchProxy(chemContainer.id, '/chem/health_check', { method: 'GET' }),
-            awaitStatus(chemContainer.id, 'started', 90000, _package.logger)
-          ]
-        : []),
-
-      ...(chempropContainer.status !== 'started'
-        ? [
-            grok.dapi.docker.dockerContainers.fetchProxy(chempropContainer.id, '/modeling/health_check', { method: 'GET' }),
-            awaitStatus(chempropContainer.id, 'started', 90000, _package.logger)
-          ]
-        : [])
-    ]);
+    if (!chemContainer.status.startsWith('started'))
+      await grok.dapi.docker.dockerContainers.run(chemContainer.id, true);
+
+    if (!chemContainer.status.startsWith('started'))
+      await grok.dapi.docker.dockerContainers.run(chempropContainer.id, true);
   });
 
   test('similarity search', async () => {

packages/Docking/dockerfiles/autodock/autodock.py

@@ -148,10 +148,6 @@ def extract_json_values(json_data):
     debug_mode = request.args.get('debug', False)
     return receptor_value, receptor_format, ligand_value, ligand_format, autodock_gpf, pose_count, debug_mode
 
-@app.route('/health_check', methods=['GET'])
-def health_check():
-    return jsonify({"success": True}), 200
-
 @app.route('/check_opencl', methods=['GET'])
 def check_opencl():
     try:

packages/Docking/src/apps/auto-dock-app.ts

@@ -11,7 +11,6 @@ import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
 
 import {_package, BINDING_ENERGY_COL, POSE_COL, ERROR_COL_NAME} from '../utils/constants';
 import {buildDefaultAutodockGpf} from '../utils/auto-dock-service';
-import {fetchWrapper} from '@datagrok-libraries/utils/src/fetch-utils';
 
 export type AutoDockDataType = {
   ligandDf: DG.DataFrame,

packages/Docking/src/tests/autodock-tests.ts

@@ -20,14 +20,10 @@ category('AutoDock', () => {
       // Initialize the service if not already initialized
       if (!adSvc)
         adSvc = await getAutoDockService();
-
-      // Perform a health check to start the container (starts on request) if not ready
-      if (!adSvc.ready) {
-        await Promise.all([
-          fetchWrapper(() => adSvc!.healthCheck()),
-          adSvc.awaitStatus('started', 90000),
-        ]);
-      } 
+
+      const dockingContainer = await grok.dapi.docker.dockerContainers.filter('docking').first();
+      if (!dockingContainer.status.startsWith('started'))
+        await grok.dapi.docker.dockerContainers.run(dockingContainer.id, true); 
     } catch (err: unknown) {
       // Log any errors during initialization
       const [errMsg, errStack] = errInfo(err);

packages/Docking/src/utils/auto-dock-service.ts

@@ -96,17 +96,6 @@ export class AutoDockService implements IAutoDockService {
   }
 
   // -- Methods --
-
-  async healthCheck(): Promise<void> {
-    const path = '/health_check';
-    const params: RequestInit = {
-      method: 'GET',
-    }
-    const adRes = await this.fetchAndCheck(path, params);
-    if (!adRes)
-      throw new Error('Health check failed.');
-  }
-
   async checkOpenCl(): Promise<number> {
     const path = '/check_opencl';
     const params: RequestInit = {