store unit_name

Author: aleivag

.github/workflows/ci.yml

@@ -8,31 +8,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.10', '3.11', '3.12', '3.13']
+        python: ['3.10', '3.11', '3.12', '3.13', '3.14']
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Setup Python
-      uses: actions/setup-python@v2
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
       with:
         python-version: ${{ matrix.python }}
+  
+    # - name: Setup Python
+    #   uses: actions/setup-python@v2
+    #   with:
+    #     python-version: ${{ matrix.python }}
+
     - name: update APT
       run: sudo apt-get update
     - name: Install dependencies
       run: sudo apt-get install -y libsystemd-dev
-    - name: Install pystemd
-      run: pip install -e '.[t]'
+    
+    - name: Install environment
+      run: uv sync --all-extras --dev
+
+    - name: Assert Python Version
+      run: uv run python -V
+
     - name: Run unit tests
-      run: pytest --cov=pystemd tests
+      run: uv run pytest --cov=pystemd tests
 
   formatting:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Run black
-      uses: psf/black@stable
+    - name: Run ruff
+      uses: astral-sh/ruff-action@v3
+      with:
+        src: >-
+          pystemd
+          examples
+          tests
     - name: Run isort
       uses: isort/isort-action@v1
 
@@ -42,7 +58,15 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: install mypy
-      run:  pip install mypy types-psutil
-    - name: run mypy
-      run: mypy
+    - name: Install uv
+      uses: astral-sh/setup-uv@v7
+
+    - name: update APT
+      run: sudo apt-get update
+    - name: Install dependencies
+      run: sudo apt-get install -y libsystemd-dev
+    
+    - name: install environment
+      run:  uv sync --extra lint
+    - name: run pyrefly
+      run: uv run pyrefly check pystemd examples tests

.gitignore

@@ -95,3 +95,7 @@ pystemd/RELEASE
 /pystemd-*.tar.gz
 /python-pystemd-*.src.rpm
 /python-pystemd.spec
+
+
+# uv files
+uv.lock

pyproject.toml

@@ -7,6 +7,7 @@ name = "pystemd"
 version = "0.14.0"
 readme = "README.md"
 description="A systemd binding for python"
+requires-python = ">=3.10"
 dependencies = [
     "lxml",
     "psutil"
@@ -40,11 +41,12 @@ t = [
   "pytest", 
   "pytest-cov", 
   # cstq and toml are used for testing version
-  "cstq", "toml"
+  "cstq", 
+  "toml",
 ]
 lint = [
-    "black",
-    "mypi",
+    "ruff",
+    "pyrefly",
     "isort",
 ]
 
@@ -53,10 +55,6 @@ changelog = "https://github.com/systemd/pystemd/blob/main/CHANGES.md"
 homepage = "https://github.com/systemd/pystemd"
 repository = "https://github.com/systemd/pystemd.git"
 
-[tool.mypy]
-strict = false
-packages = ["pystemd"]
-
 [tool.isort]
 atomic = true
 profile = "black"

pystemd/__init__.pyi

@@ -8,7 +8,7 @@
 
 from typing import Any
 
-from pystemd import DBus, __version__, machine1, systemd1
+from pystemd import machine1, systemd1
 
 SDUnit = systemd1.Unit
 SDManager = systemd1.Manager

pystemd/base.pyi

@@ -6,13 +6,11 @@
 # the root directory of this source tree.
 #
 
-import re
 from contextlib import contextmanager
 from typing import Any, AnyStr, Iterator, Optional
 from xml.dom.minidom import Element
 
-from pystemd.dbuslib import DBus, apply_signature
-from pystemd.utils import x2char_star
+from pystemd.dbuslib import DBus
 
 class SDObject(object):
     def __init__(

pystemd/futures.py

@@ -1,5 +1,6 @@
 import os
 from concurrent.futures import ProcessPoolExecutor
+from functools import cached_property
 from multiprocessing import Process
 from multiprocessing.context import BaseContext
 from pathlib import Path
@@ -10,6 +11,7 @@
 import pystemd.cutils
 import pystemd.run
 import pystemd.utils
+from pystemd.dbuslib import DBus
 
 
 class TransientUnitContext(BaseContext):
@@ -24,10 +26,12 @@ def __init__(
         properties: Dict[str, Any],
         main_process: Sequence[str] = (),
         user_mode: bool = False,
+        unit_name: Optional[str] = None,
     ) -> None:
         self.unit: Optional[pystemd.systemd1.Unit] = None
         self.properties = properties
         self.user_mode = user_mode
+        self.unit_name = unit_name 
         self.main_process_cmd = main_process or [
             "/bin/bash",
             "-c",
@@ -39,6 +43,7 @@ def start_unit(self) -> pystemd.systemd1.Unit:
         assert self.unit is None, "Unit already started"
         self.unit = pystemd.run(
             self.main_process_cmd,
+            name=self.unit_name,
             user_mode=self.user_mode,
             extra={
                 **self.properties,
@@ -121,17 +126,25 @@ class TransientUnitProcess(_ProcessWithPreRun):
     the unit will finish.
     """
 
-    def __init__(self, *, properties=None, user_mode=False, **kwargs) -> None:
+    def __init__(self, *, properties=None, user_mode=False, unit_name=None, **kwargs) -> None:
         super().__init__(**kwargs)
         self.user_mode = user_mode
+        self.unit_name = unit_name or pystemd.utils.random_unit_name(prefix="pystemd-future-")  
         self.properties = {
             pystemd.utils.x2char_star(k): v for k, v in (properties or {}).items()
         }
 
+    @cached_property
+    def unit(self):
+        bus = DBus(user_mode=self.user_mode)
+        bus.__enter__()
+        return pystemd.systemd1.Unit(self.unit_name, bus, _autoload=True)
+    
     def pre_run(self):
         context = TransientUnitContext(
             properties=self.properties,
             user_mode=self.user_mode,
+            unit_name=self.unit_name,
             main_process=[
                 "/bin/bash",
                 "-c",

pystemd/run.py

@@ -13,7 +13,6 @@
 import sys
 import termios
 import tty
-import uuid
 from contextlib import ExitStack
 from selectors import EVENT_READ, DefaultSelector
 
@@ -22,7 +21,7 @@
 from pystemd.exceptions import PystemdRunError
 from pystemd.systemd1 import Manager as SDManager
 from pystemd.systemd1 import Unit
-from pystemd.utils import x2char_star, x2cmdlist
+from pystemd.utils import random_unit_name, x2char_star, x2cmdlist
 
 EXIT_SUBSTATES = (b"exited", b"failed", b"dead")
 USER_MODE = os.getuid() != 0
@@ -145,7 +144,7 @@ def bus_factory():
         else:
             return DBus(user_mode=user_mode)
 
-    name = x2char_star(name or "pystemd{}.service".format(uuid.uuid4().hex))
+    name = x2char_star(name or random_unit_name())
     runtime_max_usec = (runtime_max_sec or 0) * 10**6 or runtime_max_sec
 
     stdin, stdout, stderr = get_fno(stdin), get_fno(stdout), get_fno(stderr)

pystemd/systemd1/unit.pyi

@@ -6,11 +6,10 @@
 # the root directory of this source tree.
 #
 
-from typing import Any, AnyStr, Iterator, List, Optional, Tuple
+from typing import Any, AnyStr, List, Optional, Tuple
 
 from pystemd.base import SDInterface, SDObject
-from pystemd.dbuslib import DBus, path_encode
-from pystemd.utils import x2char_star
+from pystemd.dbuslib import DBus
 
 class Unit_Unit(SDInterface):
     ActiveEnterTimestamp: int  # t

pystemd/utils.py

@@ -7,6 +7,7 @@
 #
 
 import shlex
+import uuid
 from pathlib import Path
 from typing import Any, Iterable, List, Optional, Tuple, TypeVar, Union
 
@@ -118,3 +119,6 @@ def unwrap(obj: Optional[T], msg="object was None") -> T:
     if obj is None:
         raise ValueError(msg)
     return obj
+
+def random_unit_name(*, unit_type="service", prefix="pystemd"):
+    return f"{prefix}{uuid.uuid4().hex}.{unit_type}"