DIRACCommon 9.0.0a67__py3-none-any.whl → 9.0.0a68__py3-none-any.whl

DIRACCommon/ConfigurationSystem/Client/Helpers/Resources.py

@@ -0,0 +1,52 @@
+"""Platform utilities for DIRAC platform compatibility and management.
+
+This module provides functions for working with DIRAC platforms and OS compatibility.
+"""
+import re
+
+from DIRACCommon.Core.Utilities.ReturnValues import S_ERROR, S_OK, DReturnType
+
+
+def getDIRACPlatform(osList: list[str], osCompatibilityDict: dict[str, set[str]]) -> DReturnType[list[str]]:
+    """Get standard DIRAC platform(s) compatible with the argument.
+
+    NB: The returned value is a list, ordered by numeric components in the platform.
+    In practice the "highest" version (which should be the most "desirable" one is returned first)
+
+    :param list osList: list of platforms defined by resource providers
+    :param dict osCompatibilityDict: dictionary with OS compatibility information
+    :return: a list of DIRAC platforms that can be specified in job descriptions
+    """
+
+    if not osCompatibilityDict:
+        return S_ERROR("OS compatibility info not found")
+
+    # making an OS -> platforms dict
+    os2PlatformDict = dict()
+    for platform, osItems in osCompatibilityDict.items():
+        for osItem in osItems:
+            os2PlatformDict.setdefault(osItem, set()).add(platform)
+
+    platforms = set()
+    for os in osList:
+        platforms |= os2PlatformDict.get(os, set())
+
+    if not platforms:
+        return S_ERROR(f"No compatible DIRAC platform found for {','.join(osList)}")
+
+    return S_OK(sorted(platforms, key=_platformSortKey, reverse=True))
+
+
+def _platformSortKey(version: str) -> list[str]:
+    # Loosely based on distutils.version.LooseVersion
+    parts = []
+    for part in re.split(r"(\d+|[a-z]+|\.| -)", version.lower()):
+        if not part or part == ".":
+            continue
+        if part[:1] in "0123456789":
+            part = part.zfill(8)
+        else:
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+        parts.append(part)
+    return parts

DIRACCommon/ConfigurationSystem/Client/Helpers/__init__.py

@@ -0,0 +1,3 @@
+"""
+DIRACCommon.ConfigurationSystem.Client.Helpers - Configuration system helper functions
+"""

DIRACCommon/ConfigurationSystem/Client/__init__.py

@@ -0,0 +1,3 @@
+"""
+DIRACCommon.ConfigurationSystem.Client - Configuration system client components
+"""

DIRACCommon/ConfigurationSystem/__init__.py

@@ -0,0 +1,3 @@
+"""
+DIRACCommon.ConfigurationSystem - Configuration system components
+"""

diraccommon-9.0.0a68.dist-info/METADATA

@@ -0,0 +1,281 @@
+Metadata-Version: 2.4
+Name: DIRACCommon
+Version: 9.0.0a68
+Summary: Stateless utilities extracted from DIRAC for use by DiracX and other projects
+Project-URL: Homepage, https://github.com/DIRACGrid/DIRAC
+Project-URL: Documentation, https://dirac.readthedocs.io/
+Project-URL: Source Code, https://github.com/DIRACGrid/DIRAC
+Author-email: DIRAC Collaboration <dirac-dev@cern.ch>
+License: GPL-3.0-only
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Scientific/Engineering
+Classifier: Topic :: System :: Distributed Computing
+Requires-Python: >=3.11
+Requires-Dist: diraccfg
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: typing-extensions>=4.0.0
+Provides-Extra: testing
+Requires-Dist: pytest-cov>=4.0.0; extra == 'testing'
+Requires-Dist: pytest>=7.0.0; extra == 'testing'
+Description-Content-Type: text/markdown
+
+# DIRACCommon
+
+Stateless utilities extracted from DIRAC for use by DiracX and other projects without triggering DIRAC's global state initialization.
+
+## Purpose
+
+This package solves the circular dependency issue where DiracX needs DIRAC utilities but importing DIRAC triggers global state initialization. DIRACCommon contains only stateless utilities that can be safely imported without side effects.
+
+## Contents
+
+- `DIRACCommon.Core.Utilities.ReturnValues`: DIRAC's S_OK/S_ERROR return value system
+- `DIRACCommon.Core.Utilities.DErrno`: DIRAC error codes and utilities
+- `DIRACCommon.Core.Utilities.ClassAd.ClassAdLight`: JDL parsing utilities
+- `DIRACCommon.Core.Utilities.TimeUtilities`: Time and date utilities
+- `DIRACCommon.Core.Utilities.StateMachine`: State machine utilities
+- `DIRACCommon.Core.Utilities.JDL`: JDL parsing utilities
+- `DIRACCommon.Core.Utilities.List`: List manipulation utilities
+- `DIRACCommon.ConfigurationSystem.Client.Helpers.Resources`: Platform compatibility utilities
+- `DIRACCommon.WorkloadManagementSystem.Client.JobStatus`: Job status constants and state machines
+- `DIRACCommon.WorkloadManagementSystem.Client.JobState.JobManifest`: Job manifest utilities
+- `DIRACCommon.WorkloadManagementSystem.DB.JobDBUtils`: Job database utilities
+- `DIRACCommon.WorkloadManagementSystem.Utilities.JobModel`: Pydantic-based job models
+- `DIRACCommon.WorkloadManagementSystem.Utilities.JobStatusUtility`: Job status utilities
+- `DIRACCommon.WorkloadManagementSystem.Utilities.ParametricJob`: Parametric job utilities
+
+## Installation
+
+```bash
+pip install DIRACCommon
+```
+
+## Usage
+
+### Basic Usage
+
+```python
+from DIRACCommon.Core.Utilities.ReturnValues import S_OK, S_ERROR
+
+def my_function():
+    if success:
+        return S_OK("Operation successful")
+    else:
+        return S_ERROR("Operation failed")
+```
+
+## Development
+
+This package is part of the DIRAC project and shares its version number. When DIRAC is released, DIRACCommon is also released with the same version.
+
+```bash
+pixi install
+pixi run pytest
+```
+
+## Migrating Code to DIRACCommon
+
+This section documents the proper pattern for moving code from DIRAC to DIRACCommon to enable shared usage by DiracX and other projects.
+
+### Migration Pattern
+
+The migration follows a specific pattern to maintain backward compatibility while making code stateless:
+
+1. **Move core functionality to DIRACCommon** - Create the stateless version
+2. **Update DIRAC module** - Make it a backward compatibility wrapper
+3. **Move and update tests** - Ensure both versions are tested
+4. **Verify migration** - Test both import paths work correctly
+
+### Step-by-Step Migration Process
+
+#### 1. Create DIRACCommon Module
+
+Create the new module in DIRACCommon with the **exact same directory structure** as DIRAC:
+
+```bash
+# Example: Moving from src/DIRAC/ConfigurationSystem/Client/Helpers/Resources.py
+# Create: dirac-common/src/DIRACCommon/ConfigurationSystem/Client/Helpers/Resources.py
+```
+
+#### 2. Make Code Stateless
+
+**❌ Remove these dependencies:**
+```python
+# DON'T import these in DIRACCommon
+from DIRAC import gConfig, gLogger, gMonitor, Operations
+from DIRAC.Core.Security import getProxyInfo
+# Any other DIRAC global state
+```
+
+**✅ Use these instead:**
+```python
+# Use DIRACCommon's own utilities
+from DIRACCommon.Core.Utilities.ReturnValues import S_OK, S_ERROR
+from DIRACCommon.Core.Utilities.DErrno import strerror
+
+# Accept configuration data as parameters
+def my_function(data, config_dict):
+    # Use config_dict instead of gConfig.getOptionsDict()
+    pass
+```
+
+#### 3. Handle Configuration Data
+
+**❌ Don't do this:**
+```python
+# DIRACCommon function taking config object
+def getDIRACPlatform(OSList, config):
+    result = config.getOptionsDict("/Resources/Computing/OSCompatibility")
+    # ...
+```
+
+**✅ Do this instead:**
+```python
+# DIRACCommon function taking configuration data directly
+def getDIRACPlatform(osList: str | list[str], osCompatibilityDict: dict[str, set[str]]) -> DReturnType[list[str]]:
+    if not osCompatibilityDict:
+        return S_ERROR("OS compatibility info not found")
+    # Use osCompatibilityDict directly
+    # ...
+```
+
+#### 4. Update DIRAC Module for Backward Compatibility
+
+Transform the original DIRAC module into a backward compatibility wrapper:
+
+```python
+"""Backward compatibility wrapper - moved to DIRACCommon
+
+This module has been moved to DIRACCommon.ConfigurationSystem.Client.Helpers.Resources
+to avoid circular dependencies and allow DiracX to use these utilities without
+triggering DIRAC's global state initialization.
+
+All exports are maintained for backward compatibility.
+"""
+
+# Re-export everything from DIRACCommon for backward compatibility
+from DIRACCommon.ConfigurationSystem.Client.Helpers.Resources import (
+    getDIRACPlatform as _getDIRACPlatform,
+    _platformSortKey,
+)
+
+from DIRAC import S_ERROR, S_OK, gConfig
+
+def getDIRACPlatform(OSList):
+    """Get standard DIRAC platform(s) compatible with the argument.
+
+    Backward compatibility wrapper that uses gConfig.
+    """
+    result = gConfig.getOptionsDict("/Resources/Computing/OSCompatibility")
+    if not (result["OK"] and result["Value"]):
+        return S_ERROR("OS compatibility info not found")
+
+    # Convert string values to sets for DIRACCommon function
+    platformsDict = {k: set(v.replace(" ", "").split(",")) for k, v in result["Value"].items()}
+    for k, v in platformsDict.items():
+        if k not in v:
+            v.add(k)
+
+    return _getDIRACPlatform(OSList, platformsDict)
+
+# Re-export the helper function
+_platformSortKey = _platformSortKey
+```
+
+#### 5. Move and Update Tests
+
+**Create DIRACCommon tests:**
+```python
+# dirac-common/tests/ConfigurationSystem/Client/Helpers/test_Resources.py
+from DIRACCommon.ConfigurationSystem.Client.Helpers.Resources import getDIRACPlatform
+
+def test_getDIRACPlatform():
+    # Test with configuration data directly
+    osCompatibilityDict = {
+        "plat1": {"OS1", "OS2"},
+        "plat2": {"OS3", "OS4"}
+    }
+    result = getDIRACPlatform("OS1", osCompatibilityDict)
+    assert result["OK"]
+    assert "plat1" in result["Value"]
+```
+
+**Update DIRAC tests:**
+```python
+# src/DIRAC/ConfigurationSystem/Client/Helpers/test/Test_Helpers.py
+from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getDIRACPlatform
+
+def test_getDIRACPlatform():
+    # Test backward compatibility wrapper
+    # (existing tests should continue to work)
+    pass
+```
+
+#### 6. Create Directory Structure
+
+Ensure the DIRACCommon directory structure mirrors DIRAC exactly:
+
+```bash
+dirac-common/src/DIRACCommon/
+├── ConfigurationSystem/
+│   ├── __init__.py
+│   └── Client/
+│       ├── __init__.py
+│       └── Helpers/
+│           ├── __init__.py
+│           └── Resources.py
+└── tests/
+    └── ConfigurationSystem/
+        ├── __init__.py
+        └── Client/
+            ├── __init__.py
+            └── Helpers/
+                ├── __init__.py
+                └── test_Resources.py
+```
+
+### Requirements for DIRACCommon Code
+
+Code in DIRACCommon **MUST** be:
+
+- **Completely stateless** - No global variables or state
+- **No DIRAC dependencies** - Cannot import from DIRAC
+- **No global state access** - Cannot use `gConfig`, `gLogger`, `gMonitor`, etc.
+- **No database connections** - Cannot establish DB connections
+- **No side effects on import** - Importing should not trigger any initialization
+- **Pure functions** - Functions should be deterministic and side-effect free
+
+### Configuration Data Handling
+
+When DIRACCommon functions need configuration data:
+
+1. **Accept data as parameters** - Don't accept config objects
+2. **Use specific data types** - Pass dictionaries, not config objects
+3. **Let DIRAC wrapper handle gConfig** - DIRAC gets data and passes it to DIRACCommon
+
+### Example Migration
+
+See the migration of `getDIRACPlatform` in:
+- `dirac-common/src/DIRACCommon/ConfigurationSystem/Client/Helpers/Resources.py`
+- `src/DIRAC/ConfigurationSystem/Client/Helpers/Resources.py`
+
+This demonstrates the complete pattern from stateless DIRACCommon implementation to backward-compatible DIRAC wrapper.
+
+### Testing the Migration
+
+After migration, verify:
+
+1. **DIRACCommon tests pass** - `pixi run python -m pytest dirac-common/tests/`
+2. **DIRAC tests pass** - `pixi run python -m pytest src/DIRAC/`
+3. **Both import paths work**:
+   ```python
+   # DIRACCommon (stateless)
+   from DIRACCommon.ConfigurationSystem.Client.Helpers.Resources import getDIRACPlatform
+
+   # DIRAC (backward compatibility)
+   from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getDIRACPlatform
+   ```
+4. **No linting errors** - All code should pass linting checks

{diraccommon-9.0.0a67.dist-info → diraccommon-9.0.0a68.dist-info}/RECORD

@@ -1,4 +1,8 @@
 DIRACCommon/__init__.py,sha256=o31FFvmIiU2Wsc9nfsPZVaXYK9d3KTN0vOa8mZS6x5E,587
+DIRACCommon/ConfigurationSystem/__init__.py,sha256=zD7hqGhEaKikUOFQ9fYd-T1nGE3A7hBQnSbZMNdde_Q,74
+DIRACCommon/ConfigurationSystem/Client/__init__.py,sha256=wc_AKSzmjk_56P_CMkihYaEX4RUiED3XZCLcwZ9NPoY,88
+DIRACCommon/ConfigurationSystem/Client/Helpers/Resources.py,sha256=N8gRrfv3Ai-tzloNTvCb3jOMHj7PkMzKiWd-MmWu2vA,1904
+DIRACCommon/ConfigurationSystem/Client/Helpers/__init__.py,sha256=gCIB_25s-6H77hwho9ex_nUnMX2vvzg1Rr33u1-mLkI,95
 DIRACCommon/Core/__init__.py,sha256=Kv_Rkbm9hOPmHSnTG0_i7QR5Tck8bldITONhsoT2syg,33
 DIRACCommon/Core/Utilities/DErrno.py,sha256=LUaIcKkjuioTMO3O7H9T9Pk5pHUS63Nzx3FcaP40n5c,7998
 DIRACCommon/Core/Utilities/JDL.py,sha256=z4RID730tbCmbgldKfhSFc9ADfXDhUfjaBG8RpuK2Bs,6724
@@ -20,6 +24,6 @@ DIRACCommon/WorkloadManagementSystem/Utilities/JobModel.py,sha256=kpvsxQnR-j9Y9I
 DIRACCommon/WorkloadManagementSystem/Utilities/JobStatusUtility.py,sha256=Kf4o1bp25JLsRb-Vsc4NuM6w1Io2hg_ALtIyqBk-Qhw,3628
 DIRACCommon/WorkloadManagementSystem/Utilities/ParametricJob.py,sha256=iYd29TgGXZk31pQLPw_frIhcmZB9X-RmuDmIRxzgiww,7405
 DIRACCommon/WorkloadManagementSystem/Utilities/__init__.py,sha256=XMOUD0OcPVo-mjuA0vU-mbtf9K0kBMy5I5sELrX3HEs,53
-diraccommon-9.0.0a67.dist-info/METADATA,sha256=NA1PLIfXlFQ4tWmuf1m_7mSvSlHBuHVudhsOIC_VRDs,2575
-diraccommon-9.0.0a67.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-diraccommon-9.0.0a67.dist-info/RECORD,,
+diraccommon-9.0.0a68.dist-info/METADATA,sha256=ls6roTiA24Si3-mNyiqPDfXr13szs1e9tnVjzGH-n5I,9738
+diraccommon-9.0.0a68.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+diraccommon-9.0.0a68.dist-info/RECORD,,

diraccommon-9.0.0a67.dist-info/METADATA

@@ -1,74 +0,0 @@
-Metadata-Version: 2.4
-Name: DIRACCommon
-Version: 9.0.0a67
-Summary: Stateless utilities extracted from DIRAC for use by DiracX and other projects
-Project-URL: Homepage, https://github.com/DIRACGrid/DIRAC
-Project-URL: Documentation, https://dirac.readthedocs.io/
-Project-URL: Source Code, https://github.com/DIRACGrid/DIRAC
-Author-email: DIRAC Collaboration <dirac-dev@cern.ch>
-License: GPL-3.0-only
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Scientific/Engineering
-Classifier: Topic :: System :: Distributed Computing
-Requires-Python: >=3.11
-Requires-Dist: diraccfg
-Requires-Dist: pydantic>=2.0.0
-Requires-Dist: typing-extensions>=4.0.0
-Provides-Extra: testing
-Requires-Dist: pytest-cov>=4.0.0; extra == 'testing'
-Requires-Dist: pytest>=7.0.0; extra == 'testing'
-Description-Content-Type: text/markdown
-
-# DIRACCommon
-
-Stateless utilities extracted from DIRAC for use by DiracX and other projects without triggering DIRAC's global state initialization.
-
-## Purpose
-
-This package solves the circular dependency issue where DiracX needs DIRAC utilities but importing DIRAC triggers global state initialization. DIRACCommon contains only stateless utilities that can be safely imported without side effects.
-
-## Contents
-
-- `DIRACCommon.Core.Utilities.ReturnValues`: DIRAC's S_OK/S_ERROR return value system
-- `DIRACCommon.Core.Utilities.DErrno`: DIRAC error codes and utilities
-- `DIRACCommon.Core.Utilities.ClassAd.ClassAdLight`: JDL parsing utilities
-- `DIRACCommon.WorkloadManagementSystem.DB.JobDBUtils`: Job database utilities
-- `DIRACCommon.WorkloadManagementSystem.Utilities.ParametricJob`: Parametric job utilities
-
-## Installation
-
-```bash
-pip install DIRACCommon
-```
-
-## Usage
-
-```python
-from DIRACCommon.Core.Utilities.ReturnValues import S_OK, S_ERROR
-
-def my_function():
-    if success:
-        return S_OK("Operation successful")
-    else:
-        return S_ERROR("Operation failed")
-```
-
-## Development
-
-This package is part of the DIRAC project and shares its version number. When DIRAC is released, DIRACCommon is also released with the same version.
-
-```bash
-pixi install
-pixi run pytest
-```
-
-## Guidelines for Adding Code
-
-Code added to DIRACCommon must:
-- Be completely stateless
-- Not import or use any of DIRAC's global objects (`gConfig`, `gLogger`, `gMonitor`, `Operations`)
-- Not establish database connections
-- Not have side effects on import