wwpdb.apps.msgmodule 0.180__tar.gz → 0.180.2__tar.gz

{wwpdb_apps_msgmodule-0.180 → wwpdb_apps_msgmodule-0.180.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wwpdb.apps.msgmodule
-Version: 0.180
+Version: 0.180.2
 Summary: wwPDB messaging module
 Home-page: https://github.com/rcsb/py-wwpdb_apps_ann_tasks_v2
 Author: Ezra Peisach

{wwpdb_apps_msgmodule-0.180 → wwpdb_apps_msgmodule-0.180.2}/wwpdb/apps/msgmodule/__init__.py

@@ -2,4 +2,4 @@ __docformat__ = "restructuredtext en"
 __author__ = "Ezra Peisach"
 __email__ = "ezra.peisach@rcsb.org"
 __license__ = "Apache 2.0"
-__version__ = "0.180"
+__version__ = "0.180.2"

{wwpdb_apps_msgmodule-0.180 → wwpdb_apps_msgmodule-0.180.2}/wwpdb/apps/msgmodule/db/PdbxMessageIo.py

@@ -662,6 +662,11 @@ class PdbxMessageIo:
         """
         self._block_id = blockId
 
+    def getCurrentContainerId(self):
+        """  Return the name of current container.
+        """
+        return "message"
+
     # --------- Ordinal helpers (kept for API compatibility) ---------
 
     def nextMessageOrdinal(self) -> int:

{wwpdb_apps_msgmodule-0.180 → wwpdb_apps_msgmodule-0.180.2}/wwpdb/apps/msgmodule/io/CompatIo.py

@@ -78,6 +78,11 @@ class PdbxMessageIo:
     def newBlock(self, blockId: str) -> None:
         self.__impl.newBlock(blockId)
 
+    def getCurrentContainerId(self):
+        """  Return the name of current container.
+        """
+        return self.__impl.getCurrentContainerId()
+
     def nextMessageOrdinal(self) -> int:
         return self.__impl.nextMessageOrdinal()
 

{wwpdb_apps_msgmodule-0.180 → wwpdb_apps_msgmodule-0.180.2}/wwpdb/apps/msgmodule/util/ExtractMessage.py

@@ -130,8 +130,14 @@ class ExtractMessage(object):
 
                                 def getObj(self, category_name):
                                     if category_name == "pdbx_deposition_message_info":
+                                        # Only return category if messages exist
+                                        if not self._data:
+                                            return None
                                         return SimpleCategory(self._data)
                                     if category_name == "pdbx_deposition_message_file_reference":
+                                        # Only return category if file references exist
+                                        if not self._refdata:
+                                            return None
                                         return SimpleCategory(self._refdata, True)
                                     return None
 
@@ -607,23 +613,49 @@ class ExtractMessage(object):
         ret = None
         self.__readMsgFile(depid, contentType=msg_content, b_use_cache=b_use_cache, test_folder=test_folder)
 
+        logger.debug("Deposition %s: Message containers loaded: %d", depid, len(self.__lc))
+
         if len(self.__lc) >= 1:
             c0 = self.__lc[0]
             # Now check messages
 
+            # Debug: Let's see what categories are available
+            logger.debug("Deposition %s: Container type: %s", depid, type(c0))
+            logger.debug("Deposition %s: Container has getObj method: %s", depid, hasattr(c0, 'getObj'))
+
             catObj = c0.getObj("pdbx_deposition_message_info")
             if catObj is None:
-                logger.debug("Deposition %s no pdbx_deposition_message_info category", depid)
+                logger.debug("Deposition %s: NO pdbx_deposition_message_info category found", depid)
+                # Let's try to see what's available in the container
+                if hasattr(c0, '_data'):
+                    logger.debug("Deposition %s: Container _data: %s", depid, c0._data)  # noqa: W02121 pylint: disable=protected-access
+                if hasattr(c0, '_refdata'):
+                    logger.debug("Deposition %s: Container _refdata: %s", depid, c0._refdata)  # noqa: W02121 pylint: disable=protected-access
                 return None
+            else:
+                logger.debug("Deposition %s: Found pdbx_deposition_message_info category", depid)
 
             #
             # Get column name index.
             #
             itDict = {}
             itNameList = catObj.getItemNameList()
+            logger.debug("Deposition %s: Available item names: %s", depid, itNameList)
             for idxIt, itName in enumerate(itNameList):
                 itDict[str(itName).lower()] = idxIt
             #
+            logger.debug("Deposition %s: itDict keys: %s", depid, list(itDict.keys()))
+            logger.debug("Deposition %s: Looking for timestamp key: '_pdbx_deposition_message_info.timestamp'", depid)
+            logger.debug("Deposition %s: Looking for send_status key: '_pdbx_deposition_message_info.send_status'", depid)
+
+            # Check if required fields exist to prevent KeyError
+            if "_pdbx_deposition_message_info.timestamp" not in itDict:
+                logger.warning("Deposition %s: timestamp field not found in message info", depid)
+                return None
+            if "_pdbx_deposition_message_info.send_status" not in itDict:
+                logger.warning("Deposition %s: send_status field not found in message info", depid)
+                return None
+
             idxTimeStamp = itDict["_pdbx_deposition_message_info.timestamp"]
             idxSendStatus = itDict["_pdbx_deposition_message_info.send_status"]
 

{wwpdb_apps_msgmodule-0.180 → wwpdb_apps_msgmodule-0.180.2}/wwpdb.apps.msgmodule.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wwpdb.apps.msgmodule
-Version: 0.180
+Version: 0.180.2
 Summary: wwPDB messaging module
 Home-page: https://github.com/rcsb/py-wwpdb_apps_ann_tasks_v2
 Author: Ezra Peisach