Always use the dcg function in the client

Author: stephen-riggs

src/murfey/client/contexts/spa_metadata.py

@@ -106,7 +106,12 @@ def post_transfer(
                 return
 
             if source:
-                dcg_tag = ensure_dcg_exists("spa", source, environment, self._token)
+                dcg_tag = ensure_dcg_exists(
+                    collection_type="spa",
+                    metadata_source=source,
+                    environment=environment,
+                    token=self._token,
+                )
                 gs_pix_positions = get_grid_square_atlas_positions(
                     source.parent / partial_path
                 )
@@ -140,7 +145,12 @@ def post_transfer(
             source = _get_source(transferred_file, environment=environment)
             if source is None:
                 return None
-            ensure_dcg_exists("spa", source, environment, self._token)
+            ensure_dcg_exists(
+                collection_type="spa",
+                metadata_source=source,
+                environment=environment,
+                token=self._token,
+            )
 
             gs_name = int(transferred_file.stem.split("_")[1])
             logger.info(

src/murfey/client/contexts/tomo.py

@@ -8,8 +8,7 @@
 import xmltodict
 
 import murfey.util.eer
-from murfey.client.context import Context, ProcessingParameter
-from murfey.client.contexts.tomo_metadata import ensure_tomo_dcg_exists
+from murfey.client.context import Context, ProcessingParameter, ensure_dcg_exists
 from murfey.client.instance_environment import (
     MovieID,
     MovieTracker,
@@ -105,7 +104,12 @@ def register_tomography_data_collections(
             metadata_source = (
                 self._basepath.parent / environment.visit / self._basepath.name
             )
-            ensure_tomo_dcg_exists(metadata_source, environment, self._token)
+            ensure_dcg_exists(
+                collection_type="tomo",
+                metadata_source=metadata_source,
+                environment=environment,
+                token=self._token,
+            )
 
             for tilt_series in self._tilt_series.keys():
                 if tilt_series not in self._tilt_series_with_pjids:

src/murfey/client/contexts/tomo_metadata.py

@@ -40,13 +40,21 @@ def post_transfer(
 
         if transferred_file.name == "Session.dm":
             logger.info("Tomography session metadata found")
-            ensure_dcg_exists("tomo", metadata_source, environment, self._token)
+            ensure_dcg_exists(
+                collection_type="tomo",
+                metadata_source=metadata_source,
+                environment=environment,
+                token=self._token,
+            )
 
         elif transferred_file.name == "SearchMap.xml":
             logger.info("Tomography session search map xml found")
 
             dcg_tag = ensure_dcg_exists(
-                "tomo", metadata_source, environment, self._token
+                collection_type="tomo",
+                metadata_source=metadata_source,
+                environment=environment,
+                token=self._token,
             )
             with open(transferred_file, "r") as sm_xml:
                 sm_data = xmltodict.parse(sm_xml.read())
@@ -150,7 +158,10 @@ def post_transfer(
         elif transferred_file.name == "SearchMap.dm":
             logger.info("Tomography session search map dm found")
             dcg_tag = ensure_dcg_exists(
-                "tomo", metadata_source, environment, self._token
+                collection_type="tomo",
+                metadata_source=metadata_source,
+                environment=environment,
+                token=self._token,
             )
             with open(transferred_file, "r") as sm_xml:
                 sm_data = xmltodict.parse(sm_xml.read())
@@ -198,7 +209,10 @@ def post_transfer(
         elif transferred_file.name == "BatchPositionsList.xml":
             logger.info("Tomography session batch positions list found")
             dcg_tag = ensure_dcg_exists(
-                "tomo", metadata_source, environment, self._token
+                collection_type="tomo",
+                metadata_source=metadata_source,
+                environment=environment,
+                token=self._token,
             )
             with open(transferred_file) as xml:
                 for_parsing = xml.read()

src/murfey/client/multigrid_control.py

@@ -12,6 +12,7 @@
 
 import murfey.client.websocket
 from murfey.client.analyser import Analyser
+from murfey.client.context import ensure_dcg_exists
 from murfey.client.contexts.spa import SPAModularContext
 from murfey.client.contexts.tomo import TomographyContext
 from murfey.client.destinations import determine_default_destination
@@ -610,28 +611,20 @@ def _start_dc(self, metadata_json, from_form: bool = False):
             log.info("Tomography processing flushed")
 
         elif isinstance(context, SPAModularContext):
-            dcg_data = {
-                "experiment_type_id": 37,  # Single particle
-                "tag": str(source),
-                "atlas": (
-                    str(self._environment.samples[source].atlas)
-                    if self._environment.samples.get(source)
-                    else ""
-                ),
-                "sample": (
-                    self._environment.samples[source].sample
-                    if self._environment.samples.get(source)
-                    else None
-                ),
-            }
-            capture_post(
-                base_url=str(self._environment.url.geturl()),
-                router_name="workflow.router",
-                function_name="register_dc_group",
+            if self._environment.visit in source.parts:
+                metadata_source = source
+            else:
+                metadata_source_as_str = (
+                    "/".join(source.parts[:-2])
+                    + f"/{self._environment.visit}/"
+                    + source.parts[-2]
+                )
+                metadata_source = Path(metadata_source_as_str.replace("//", "/"))
+            ensure_dcg_exists(
+                collection_type="spa",
+                metadata_source=metadata_source,
+                environment=self._environment,
                 token=self.token,
-                visit_name=self._environment.visit,
-                session_id=self.session_id,
-                data=dcg_data,
             )
             if from_form:
                 data = {

src/murfey/client/tui/app.py

@@ -14,6 +14,7 @@
 from textual.widgets import Button, Input
 
 from murfey.client.analyser import Analyser
+from murfey.client.context import ensure_dcg_exists
 from murfey.client.contexts.spa import SPAModularContext
 from murfey.client.contexts.tomo import TomographyContext
 from murfey.client.destinations import determine_default_destination
@@ -561,28 +562,20 @@ def _start_dc(self, metadata_json, from_form: bool = False):
             )
             log.info("Tomography processing flushed")
         elif isinstance(context, SPAModularContext):
-            dcg_data = {
-                "experiment_type_id": 37,  # Single particle
-                "tag": str(source),
-                "atlas": (
-                    str(self._environment.samples[source].atlas)
-                    if self._environment.samples.get(source)
-                    else ""
-                ),
-                "sample": (
-                    self._environment.samples[source].sample
-                    if self._environment.samples.get(source)
-                    else None
-                ),
-            }
-            capture_post(
-                base_url=str(self._url.geturl()),
-                router_name="workflow.router",
-                function_name="register_dc_group",
-                token=token,
-                visit_name=self._visit,
-                session_id=self._environment.murfey_session,
-                data=dcg_data,
+            if self._environment.visit in source.parts:
+                metadata_source = source
+            else:
+                metadata_source_as_str = (
+                    "/".join(source.parts[:-2])
+                    + f"/{self._environment.visit}/"
+                    + source.parts[-2]
+                )
+                metadata_source = Path(metadata_source_as_str.replace("//", "/"))
+            ensure_dcg_exists(
+                collection_type="spa",
+                metadata_source=metadata_source,
+                environment=self._environment,
+                token=self.token,
             )
             if from_form:
                 data = {