mxcubecore 1.405.0__tar.gz → 1.407.0__tar.gz

{mxcubecore-1.405.0 → mxcubecore-1.407.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.405.0
+Version: 1.407.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.405.0 → mxcubecore-1.407.0}/mxcubecore/HardwareObjects/ICATLIMS.py

@@ -59,6 +59,9 @@ class ICATLIMS(AbstractLims):
             Lims(name="DRAC", description="Data Repository for Advancing open sCience"),
         ]
 
+    def _create_icat_session(self, user_name: str, password: str):
+        self.icat_session: ICATSession = self.icatClient.do_log_in(password)
+
     def login(
         self,
         user_name: str,
@@ -68,7 +71,7 @@ class ICATLIMS(AbstractLims):
         msg = f"authenticate {user_name}"
         logger.debug(msg)
 
-        self.icat_session: ICATSession = self.icatClient.do_log_in(password)
+        self._create_icat_session(user_name=user_name, password=password)
 
         if self.icatClient is None or self.icatClient is None:
             msg = "Error initializing icatClient: "

mxcubecore-1.407.0/mxcubecore/HardwareObjects/LNLS/LNLSLIMS.py

@@ -0,0 +1,45 @@
+"""
+A client for ISPyB Webservices.
+"""
+
+from pyicat_plus.client.main import IcatClient
+
+from mxcubecore.HardwareObjects.ICATLIMS import ICATLIMS
+
+
+class LNLSLIMS(ICATLIMS):
+    def init(self):
+        self.url = self.get_property("ws_root")
+        self.ingesters = self.get_property("queue_urls")
+        self.investigations = []
+        self.samples = []
+
+        self.icatClient = IcatClient(
+            icatplus_restricted_url="https://icat-plus.cnpem.br"
+        )
+
+    def is_single_session_available(self):
+        """
+        True if there is no active session and there is
+        a single session available
+        """
+        return (
+            self.session_manager.active_session is None
+            and len(self.session_manager.sessions) == 1
+        )
+
+    def _create_icat_session(self, user_name: str, password: str):
+        self.icat_session = self.icatClient.do_log_in(user_name, password)
+
+    def login(self, user_name, token, is_local_host):
+        self.is_local_host = is_local_host
+        session_manager, lims_username, sessions = super().login(
+            user_name, token, self.session_manager
+        )
+        self.session_manager = session_manager
+        self.add_user_and_shared_sessions(lims_username, sessions)
+        if self.is_single_session_available():
+            single_session = self.session_manager.sessions[0]
+            self.set_active_session_by_id(single_session.session_id)
+
+        return session_manager

{mxcubecore-1.405.0 → mxcubecore-1.407.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mxcubecore"
-version = "1.405.0"
+version = "1.407.0"
 license = "LGPL-3.0-or-later"
 description = "Core libraries for the MXCuBE application"
 authors = [