p310 code simplify

Author: cmbant

.vscode/settings.json

@@ -1,10 +1,30 @@
 {
     // Python settings
-    "python.defaultInterpreterPath": "./venv/bin/python",
+    "python.analysis.diagnosticSeverityOverrides": {
+        "reportGeneralTypeIssues": "none",
+        "reportOptionalMemberAccess": "none",
+        "reportOptionalSubscript": "none",
+        "reportOptionalOperand": "none",
+        "reportOptionalIterable": "none",
+        "reportUnknownMemberType": "none",
+        "reportUnknownArgumentType": "none",
+        "reportUnknownVariableType": "none",
+        "reportUnknownParameterType": "none",
+        "reportMissingTypeStubs": "none",
+        "reportUnknownLambdaType": "none",
+        "reportImportCycles": "none",
+        "reportOptionalCall": "none",
+        "reportOptionalContextManager": "none",
+        "reportTypedDictNotRequiredAccess": "none",
+        "reportArgumentType": "none",
+        "reportOperatorIssue": "none",
+        "reportAttributeAccessIssue": "none",
+        "reportCallIssue": "none"
+    },
+    "python.analysis.typeCheckingMode": "basic",
     // Ruff settings
     "ruff.enable": true,
     "ruff.lint.enable": true,
-    "ruff.format.enable": true,
     // Editor settings
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {

cobaya/component.py

@@ -1,26 +1,27 @@
+import inspect
 import os
 import sys
 import time
-import inspect
+from importlib import import_module, resources
 from inspect import cleandoc
+from typing import List, Optional, Set, Union, get_type_hints
+
 from packaging import version
-from importlib import import_module, resources
-from typing import Optional, Union, List, Set, get_type_hints
 
+import cobaya
+from cobaya.conventions import cobaya_package, kinds, reserved_attributes
 from cobaya.log import HasLogger, LoggedError, get_logger
-from cobaya.typing import Any, InfoDict, InfoDictIn, empty_dict, validate_type
+from cobaya.mpi import is_main_process
 from cobaya.tools import (
-    resolve_packages_path,
-    load_module,
+    VersionCheckError,
+    deepcopy_where_possible,
     get_base_classes,
     get_internal_class_component_name,
-    deepcopy_where_possible,
-    VersionCheckError,
+    load_module,
+    resolve_packages_path,
 )
-from cobaya.conventions import kinds, cobaya_package, reserved_attributes
-from cobaya.yaml import yaml_load_file, yaml_dump, yaml_load
-from cobaya.mpi import is_main_process
-import cobaya
+from cobaya.typing import Any, InfoDict, InfoDictIn, empty_dict, validate_type
+from cobaya.yaml import yaml_dump, yaml_load, yaml_load_file
 
 
 class Timer:
@@ -249,7 +250,7 @@ def get_class_options(cls, input_options=empty_dict) -> InfoDict:
     @classmethod
     def get_defaults(
         cls, return_yaml=False, yaml_expand_defaults=True, input_options=empty_dict
-    ):
+    ) -> dict | str:
         """
         Return defaults for this component_or_class, with syntax:
 
@@ -340,15 +341,7 @@ def get_annotations(cls) -> InfoDict:
         for base in cls.__bases__:
             if issubclass(base, HasDefaults) and base is not HasDefaults:
                 d.update(base.get_annotations())
-
-            # from Python 10 should use just cls.__annotations__
-            d.update(
-                {
-                    k: v
-                    for k, v in cls.__dict__.get("__annotations__", {}).items()
-                    if not k.startswith("_")
-                }
-            )
+            d.update(cls.__annotations__)
         return d
 
 

cobaya/functions.py

@@ -1,5 +1,6 @@
-import numpy as np
 import logging
+
+import numpy as np
 import scipy
 
 try:
@@ -17,7 +18,7 @@
 else:
     import warnings
 
-    def random_SO_N(dim, random_state):
+    def random_SO_N(dim, *, random_state=None):
         """
         Draw random samples from SO(N).
         Equivalent to scipy function but about 10x faster

cobaya/typing.py

@@ -1,18 +1,12 @@
-from typing import Dict, Any, Optional, Union, Type, TypedDict, Literal
-from collections.abc import Mapping, Callable, Sequence, Iterable
-from types import MappingProxyType
 import contextlib
-import typing
 import numbers
-import numpy as np
 import sys
+import typing
+from collections.abc import Callable, Iterable, Mapping, Sequence
+from types import MappingProxyType, UnionType
+from typing import Any, Dict, Literal, Optional, Type, TypedDict, Union
 
-# Import UnionType for Python 3.10+ compatibility
-try:
-    from types import UnionType
-except ImportError:
-    # Python < 3.10
-    UnionType = None
+import numpy as np
 
 InfoDict = dict[str, Any]
 InfoDictIn = Mapping[str, Any]
@@ -201,8 +195,7 @@ def validate_type(expected_type: type, value: Any, path: str = ""):
     ):
         # complex types like Dict[str, float] etc.
 
-        # Handle both typing.Union and types.UnionType (Python 3.10+)
-        if origin is Union or (UnionType is not None and origin is UnionType):
+        if origin is Union or origin is UnionType:
             errors = []
             for t in args:
                 try:

docs/conf.py

@@ -15,9 +15,10 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
+import ast
 import os
 import sys
-import ast
+
 import yaml
 
 project = "cobaya"
@@ -73,13 +74,17 @@
 
 # General information about the project.
 
-fields = {"__year__": None, "__author__": None, "__version__": None}
+fields = {"__year__": "", "__author__": "", "__version__": ""}
 
 with open(f"../{project}/__init__.py") as f:
     tree = ast.parse(f.read())
 
 for node in ast.walk(tree):
-    if isinstance(node, ast.Assign) and node.targets[0].id in fields:
+    if (
+        isinstance(node, ast.Assign)
+        and isinstance(node.targets[0], ast.Name)
+        and node.targets[0].id in fields
+    ):
         fields[node.targets[0].id] = ast.literal_eval(node.value)
 
 copyright = fields["__year__"] + " " + fields["__author__"]
@@ -94,15 +99,14 @@
 # The full version, including alpha/beta/rc tags.
 release = version
 
-from cobaya.tools import get_available_internal_classes
-from cobaya.likelihood import Likelihood
-from cobaya.theory import Theory
-from cobaya.sampler import Sampler
-
 # Config of the inheritance diagram
-
 from sphinx.ext import inheritance_diagram
 
+from cobaya.likelihood import Likelihood
+from cobaya.sampler import Sampler
+from cobaya.theory import Theory
+from cobaya.tools import get_available_internal_classes
+
 inheritance_graph_attrs = dict(rankdir="LR", size='""')
 
 # change inheritance diagram to pull all internal component classes
@@ -119,7 +123,9 @@ def import_classes(name, currmodule):
         return old_import(name, currmodule)
 
 
-def class_name(self, cls, parts, aliases):
+def class_name(
+    self, cls: type, parts: int = 0, aliases: dict[str, str] | None = None
+) -> str:
     if issubclass(cls, bases) and cls not in bases:
         name = cls.get_qualified_class_name()
         if name.startswith("_") or name.startswith(".") or name.startswith("likelihood."):