FYI: Multi-read optimization integrated into upstream python-snap7

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,17 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/doc.yml

@@ -26,14 +26,12 @@ jobs:
         with:
           enable-cache: true
       - name: Install dependencies
-        run: |
-          uv venv
-          uv pip install ".[doc,cli]"
+        run: uv sync --extra doc --extra cli
       - name: Build documentation
         run: uv run sphinx-build -N -bhtml doc/ doc/_build -W
       - name: Upload Pages artifact
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
         with:
           path: doc/_build
   deploy:
@@ -46,4 +44,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/publish-pypi.yml

@@ -17,10 +17,12 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "3.12"
-      - name: Install build
-        run: pip install build
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
       - name: Build distribution
-        run: python -m build
+        run: uv build
       - name: Upload artifact
         uses: actions/upload-artifact@v7
         with:

.github/workflows/publish-test-pypi.yml

@@ -16,10 +16,12 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "3.12"
-      - name: Install build
-        run: pip install build
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          enable-cache: true
       - name: Build distribution
-        run: python -m build
+        run: uv build
       - name: Upload artifact
         uses: actions/upload-artifact@v7
         with:

.github/workflows/source-build.yml

@@ -23,13 +23,9 @@ jobs:
         uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
-      - name: Install build tools
-        run: |
-          uv venv
-          uv pip install build
       - name: Create source tarball
         run: |
-           uv run python -m build . --sdist
+           uv build --sdist
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v7

.github/workflows/test.yml

@@ -28,14 +28,6 @@ jobs:
         with:
           enable-cache: true
       - name: Install dependencies
-        run: |
-          uv venv --python python${{ matrix.python-version }}
-          uv pip install ".[test]"
+        run: uv sync --extra test --extra s7commplus --python python${{ matrix.python-version }}
       - name: Run pytest
-        run: uv run pytest --cov=snap7 --cov-report=xml --cov-report=term
-      - name: Upload coverage report
-        if: matrix.python-version == '3.13' && matrix.runs-on == 'ubuntu-24.04'
-        uses: actions/upload-artifact@v7
-        with:
-          name: coverage-report
-          path: coverage.xml
+        run: uv run pytest --cov=snap7 --cov-report=term

.gitignore

@@ -62,3 +62,4 @@ venv*/
 snap7.dll
 
 .claude/
+.hypothesis/

CHANGES.md

@@ -1,25 +1,93 @@
 CHANGES
 =======
 
+4.0.0 (unreleased)
+-------------------
+
+Major release: new `s7` package with S7CommPlus protocol support.
+
+* New `s7` package as recommended entry point with protocol auto-detection
+* S7CommPlus V1, V2 (TLS), and V3 support for S7-1200/1500
+* S7CommPlus area read/write (M, I, Q, counters, timers)
+* S7CommPlus PLC start/stop via INVOKE
+* S7CommPlus object browsing via EXPLORE
+* S7CommPlus live symbol browsing (`client.browse()`) and datablock listing (experimental)
+* TIA Portal XML import for SymbolTable (`SymbolTable.from_tia_xml()`) (experimental)
+* Partner BSend/BRecv with correct PBC format, async receive, PDU reference echo
+* TCP_NODELAY and SO_KEEPALIVE on all sockets for lower latency
+* Structured logging with PLC connection context (`snap7.log`)
+* Command-line interface (`snap7-cli` / `s7`)
+* Multi-variable read optimizer with parallel dispatch (experimental)
+* S7 routing for multi-subnet PLC access (experimental)
+* Symbolic addressing via SymbolTable (experimental)
+* S7CommPlus CPU state reading and block transfer (upload/download)
+* Array read/write helpers (`db_read_array`, `db_write_array`)
+* Missing data type setters: `set_lint`, `set_ulint`, `set_ltime`, `set_ltod`, `set_ldt`
+* **Unified Tag API**: `client.read_tag("DB1.DBD0:REAL")` with PLC4X /
+  Siemens STEP7 syntax, replacing the homegrown SymbolTable class.
+  Loaders: `load_csv`, `load_json`, `load_tia_xml` return `dict[str, Tag]`
+* **Dual-dialect tag parsing**: `PLC4XTag` and `NodeS7Tag` subtypes of
+  `Tag` with dialect-specific `parse()` and `__str__` (round-trip).
+  `parse_tag(s, *, strict=True)` autodetects dialect from syntax markers
+  (`,` → nodeS7, `:TYPE` → PLC4X); `strict=False` accepts bare short
+  forms like `M7.1` or `IW22`. Enables pyS7 / Node-RED tag migration.
+* **Symbolic (LID-based) access for optimized DBs** (experimental):
+  `Tag.from_access_string("8A0E0001.A", "REAL")` creates a symbolic Tag;
+  `client.read_tag(tag)` routes to S7CommPlus LID-based access via the
+  PLC's symbol tree. Required for S7-1200/1500 DBs with
+  "Optimized block access" enabled (the TIA Portal V13+ default).
+* Optimizer excludes counter/timer areas from byte-range merging
+* Fixed `get_cpu_info` field offsets for real S7-300/1500 (thanks @qzertywsx)
+* Fixed `S7SZL.__str__` attribute name typo (thanks @qzertywsx)
+* Dependabot auto-merge for dependency updates
+* Documentation restructured: API Reference + Internals sections
+
+### Thanks
+
+* [@hs2bws-hash](https://github.com/hs2bws-hash) — extensive real PLC testing of Partner BSend/BRecv (#668)
+* [@QuakeString](https://github.com/QuakeString) — read optimizer inspiration via python-snap7-optimized fork
+
 3.0.0
 -----
 
 Major release: python-snap7 is now a pure Python S7 communication library.
+This version completely breaks with the previous approach of wrapping the C snap7
+shared library. The entire S7 protocol stack is now implemented in pure Python,
+greatly improving portability and making it easier to install and extend.
 
 * **Breaking**: The C snap7 library is no longer required or used
 * Complete rewrite of the S7 protocol stack in pure Python
 * Native Python implementation of TPKT (RFC 1006) and COTP (ISO 8073) layers
 * Native S7 protocol PDU encoding/decoding
 * Pure Python server implementation for testing and simulation
-* No platform-specific binary dependencies
+* No platform-specific binary dependencies — works on any platform that runs Python
 * Improved error handling and connection management
 * Full type annotations with mypy strict mode
 * CLI interface for running an S7 server emulator (`pip install "python-snap7[cli]"`)
 
-If you experience issues with 3.0, pin to the last pre-3.0 release:
+If you experience issues with 3.0, please report them on the
+[issue tracker](https://github.com/gijzelaerr/python-snap7/issues) with a clear
+description and the version you are using. As a workaround, pin to the last
+pre-3.0 release:
 
     $ pip install "python-snap7<3"
 
+### Thanks
+
+Special thanks to the following people for testing, reporting issues, and providing
+feedback during the 3.0 development:
+
+* [@lupaulus](https://github.com/lupaulus) — extensive testing and bug reports
+* [@spreeker](https://github.com/spreeker) — testing and feedback
+* [@nikteliy](https://github.com/nikteliy) — review and feedback on the rewrite
+* [@amorelettronico](https://github.com/amorelettronico) — testing
+* [@razour08](https://github.com/razour08) — testing
+* [@core-engineering](https://github.com/core-engineering) — bug reports (#553)
+* [@AndreasScharf](https://github.com/AndreasScharf) — bug reports (#572)
+* [@Robatronic](https://github.com/Robatronic) — bug reports (#574)
+* [@hirotasoshu](https://github.com/hirotasoshu) — feedback (#545)
+* [@PoitrasJ](https://github.com/PoitrasJ) — bug reports (#479)
+
 1.2
 ---
 

CLAUDE.md

@@ -8,6 +8,7 @@ Python-snap7 is a pure Python S7 communication library for interfacing with Siem
 
 ## Key Architecture
 
+### snap7/ — Legacy S7 protocol (S7-300/400, PUT/GET on S7-1200/1500)
 - **snap7/client.py**: Main Client class for connecting to S7 PLCs
 - **snap7/server.py**: Server implementation for PLC simulation
 - **snap7/logo.py**: Logo PLC communication
@@ -19,6 +20,20 @@ Python-snap7 is a pure Python S7 communication library for interfacing with Siem
 - **snap7/type.py**: Type definitions and enums (Area, Block, WordLen, etc.)
 - **snap7/error.py**: Error handling and exceptions
 
+### s7/ — Unified client with S7CommPlus + legacy fallback
+- **s7/client.py**: Unified Client — tries S7CommPlus, falls back to snap7.Client
+- **s7/async_client.py**: Unified AsyncClient — same pattern, async
+- **s7/server.py**: Unified Server wrapping both legacy and S7CommPlus
+- **s7/_protocol.py**: Protocol enum (AUTO/LEGACY/S7COMMPLUS)
+- **s7/_s7commplus_client.py**: Pure S7CommPlus sync client (internal)
+- **s7/_s7commplus_async_client.py**: Pure S7CommPlus async client (internal)
+- **s7/_s7commplus_server.py**: S7CommPlus server emulator (internal)
+- **s7/connection.py**: S7CommPlus low-level connection
+- **s7/protocol.py**: S7CommPlus protocol constants/enums
+- **s7/codec.py**: S7CommPlus encoding/decoding
+- **s7/vlq.py**: Variable-Length Quantity encoding
+- **s7/legitimation.py**: Authentication helpers
+
 ## Implementation Details
 
 ### Protocol Stack
@@ -41,24 +56,31 @@ The library implements the complete S7 protocol stack:
 - Block operations (list, info, upload, download)
 - Date/time operations
 
-### Usage
+### Usage (unified s7 package — recommended for S7-1200/1500)
+
+```python
+from s7 import Client
+
+client = Client()
+client.connect("192.168.1.10", 0, 1)  # auto-detects S7CommPlus vs legacy
+data = client.db_read(1, 0, 4)
+client.disconnect()
+```
+
+### Usage (legacy snap7 package — S7-300/400)
 
 ```python
 import snap7
 
-# Create and connect client
 client = snap7.Client()
 client.connect("192.168.1.10", 0, 1)
 
-# Read/write operations
 data = client.db_read(1, 0, 4)
 client.db_write(1, 0, bytearray([1, 2, 3, 4]))
 
-# Memory area access
 marker_data = client.mb_read(0, 4)
 client.mb_write(0, 4, bytearray([1, 2, 3, 4]))
 
-# Disconnect
 client.disconnect()
 ```
 
@@ -98,15 +120,15 @@ pytest tests/test_client.py
 ### Code Quality
 ```bash
 # Type checking
-mypy snap7 tests example
+mypy snap7 s7 tests example
 
 # Linting and formatting check
-ruff check snap7 tests example
-ruff format --diff snap7 tests example
+ruff check snap7 s7 tests example
+ruff format --diff snap7 s7 tests example
 
 # Auto-format code
-ruff format snap7 tests example
-ruff check --fix snap7 tests example
+ruff format snap7 s7 tests example
+ruff check --fix snap7 s7 tests example
 ```
 
 ### Development with tox

Makefile

@@ -29,8 +29,8 @@ doc: .venv/bin/sphinx-build
 
 .PHONY: check
 check: .venv/bin/pytest
-	 uv run ruff check snap7 tests example
-	 uv run ruff format --diff snap7 tests example
+	 uv run ruff check snap7 s7 tests example
+	 uv run ruff format --diff snap7 s7 tests example
 
 .PHONY: ruff
 ruff: .venv/bin/tox