mps-cli - mini cleanups

Author: Prithvi686

mps-cli-py/src/mpscli/model/builder/SModelBuilderBinaryPersistency.py

@@ -150,9 +150,6 @@ def _load_header(self, reader: ModelInputStream) -> int:
         return version, _model_uuid, _model_name
 
     def _read_model_reference_v2(self, reader: ModelInputStream):
-        """
-        Consume a V2 SModelReference.  Returns (uuid_str, name) or (None, None).
-        """
         kind = reader.read_u8()
         # NULL model reference
         if kind == 0x70:
@@ -169,32 +166,21 @@ def _read_model_reference_v2(self, reader: ModelInputStream):
         return uuid_str, name
 
     def _read_model_id(self, reader: ModelInputStream):
-        """Consume a V3 SModelId (may be uuid-based or string-based)."""
         kind = reader.read_u8()
-        if kind == 0x70:  # NULL
+        # NULL
+        if kind == 0x70:
             return None
-        if kind == 0x48:  # uuid-based
+        # uuid-based
+        if kind == 0x48:
             high, low = reader.read_uuid()
             return f"r:{high:016x}{low:016x}"
-        elif kind == 0x47:  # string-based
+        # string-based
+        elif kind == 0x47:
             return reader.read_string()
-        return None  # unknown kind
+        # unknown kind
+        return None
 
     def _load_model_properties(self, reader: ModelInputStream, version: int):
-        """
-        V2 format has no dependency format byte -
-            loadUsedLanguagesV2  — u16 count, each is uuid + string
-            loadModuleRefList    — engaged languages
-            loadModuleRefList    — devkits
-            loadImports V2       — u32 count, each is model_ref + i32
-
-        V3 format has dependency format byte:
-            readByte DEPENDENCY_V1
-            loadUsedLanguagesV3  — u16 count, each is readLanguage + i32
-            loadEngagedLanguages — u16 count, each is readLanguage
-            loadModuleRefList    — devkits
-            loadImports V3       — u32 count, each is model_ref
-        """
         if version == _V2:
             self._load_used_languages_v2(reader)
             # engaged languages
@@ -257,21 +243,6 @@ def _load_imports(self, reader: ModelInputStream, version: int):
             self.index_2_imported_model_uuid[str(i + 1)] = model_id or ""
 
     def _read_model_reference(self, reader: ModelInputStream):
-        """
-        Reads a SModelReference in V2 binary format where:
-            outer kind byte:
-                0x70 → NULL (nothing more to read)
-                0x07 → non-null, read sub-kind next
-            sub-kind byte:
-                0x28 → regular (uuid-based SModelId):
-                            uuid_high (u64) + uuid_low (u64)
-                            string  model_name
-                            string  stereotype/null (maybe 0x70, remove after debugging)
-                0x26 → foreign (string-based SModelId, e.g. java stubs):
-                            string  model_id  (e.g. "java:java.lang")
-                            string  model_name (e.g. "java.lang@java_stub")
-                            module_ref  (declaring module)
-        """
         kind = reader.read_u8()
         # NULL model reference
         if kind == 0x70:
@@ -301,7 +272,6 @@ def _read_model_reference(self, reader: ModelInputStream):
         return model_id
 
     def _skip_to_marker(self, reader: ModelInputStream, marker: int):
-        # Sliding-window scan until 'marker' (4-byte big-endian) is found and consumed.
         target = marker.to_bytes(4, "big")
         start = reader.pos
         while reader.pos + 4 <= len(reader.data):

mps-cli-py/src/mpscli/model/builder/SSolutionsRepositoryBuilder.py

@@ -3,13 +3,12 @@
 
 Performance optimizations:
   1. Lazy jar scanning: peek inside each zip for .msd before extracting.
-     Around 80% of jars (those without .msd) are skipped entirely so no extraction,no scan, no cleanup.
+     Looks like around 80% of jars (those without .msd) are skipped entirely so no extraction and no scan.
      This is identical to the old code because the original code also only discovered .mpb files through the .msd - models/
      chain and a jar without .msd was always skipped.
-  2. Parallel jar processing: extract/scan/parse/cleanup in a thread pool.
-     i/o-bound work so ThreadPoolExecutor is ideal.
-  3. Persistent disk cache: parsed SModel objects moved to mps_cli_cache.
-     and unchanged files load in milliseconds and cache is invalidated automatically when a file changes.
+  2. Parallel jar processing: extract/scan/parse/cleanup in a thread pool (i/o-bound work) so ThreadPoolExecutor is ideal.
+  3. Persistent disk cache: parsed SModel objects moved to mps_cli_cache and unchanged files load in probably milliseconds
+     and cache is invalidated automatically when a file changes.
 """
 
 from timeit import default_timer as timer