psytricks 2.2.0a2__tar.gz → 2.2.0a6__tar.gz

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/PKG-INFO

@@ -1,17 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: psytricks
-Version: 2.2.0a2
+Version: 2.2.0a6
 Summary: PowerShell Python Citrix Tricks.
-License: GPL-3.0-or-later
+License-Expression: GPL-3.0-or-later
+License-File: LICENSE
 Author: Niko Ehrenfeuchter
 Author-email: nikolaus.ehrenfeuchter@unibas.ch
 Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: loguru (>=0.7.0,<0.8.0)
 Requires-Dist: requests (>=2.30.0,<3.0.0)
@@ -51,8 +53,9 @@ PSyTricks ships with two options for the PowerShell layer:
 
 NOTE: this `RESTful` claim is actually not entirely true. Or basically not at
 all, it would be better called an `HTTP-JSON-RPC-API`. We'll still be using the
-term `REST` for it as this is basically what people nowadays think of when they
-are coming across this label. Sorry, [Roy T. Fielding][www_rtf].
+term `REST` for it as the functionality of this package basically serves a very
+similar purpose to what people think of when they are coming across this label.
+Apologies, [Roy T. Fielding][www_rtf].
 
 ## 🤯 Are you serious?
 
@@ -64,7 +67,7 @@ Really? 🧐
 Or, not sure if that's any better, implementing an HTTP REST API in plain
 PowerShell?!? 🫣
 
-### ✅ Yes. We. Are
+### ✅ Yes, we are
 
 *And the package name was chosen to reflect this.*
 
@@ -73,9 +76,9 @@ at all* an issue for us. Abysmal, as in: for every wrapped call a full (new)
 PowerShell process needs to be instantiated, usually taking something like 1-2
 seconds. ⏳
 
-The REST interface provides a much better performance, at the cost of some
-additional setup. If you're happy to take on this approach, the package offers a
-very smooth ride. 🎢🎡
+The REST / HTTP-RPC interface provides a much better performance, at the cost of
+some additional setup. If you're happy to take on this approach, the package
+offers a very smooth ride. 🎢🎡
 
 ## 🛠🚧 Installation
 
@@ -121,6 +124,9 @@ Service Wrapper)][www_winsw] but you may choose anything you like to launch the
 server process like NSSM, Scheduled Tasks 📅, homegrown dark magic 🪄🔮 or
 others.
 
+🧪 A more recent approach could be [Shawl][www_shawl] - let us know if you've
+tried it and how it went!
+
 To go with **WinSW** simply download the bundled version provided with each
 [PSyTricks release][www_releases]. Just look for the `.zip` asset having `REST`
 and `WinSW` in its name.
@@ -224,4 +230,5 @@ wrapper.set_maintenance(machine="vm42.vdi.example.xy", disable=False)
 [www_winsw]: https://github.com/winsw/winsw
 [www_releases]: https://github.com/imcf/psytricks/releases
 [www_rtf]: https://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven
+[www_shawl]: https://github.com/mtkennerly/shawl
 

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/README.md

@@ -29,8 +29,9 @@ PSyTricks ships with two options for the PowerShell layer:
 
 NOTE: this `RESTful` claim is actually not entirely true. Or basically not at
 all, it would be better called an `HTTP-JSON-RPC-API`. We'll still be using the
-term `REST` for it as this is basically what people nowadays think of when they
-are coming across this label. Sorry, [Roy T. Fielding][www_rtf].
+term `REST` for it as the functionality of this package basically serves a very
+similar purpose to what people think of when they are coming across this label.
+Apologies, [Roy T. Fielding][www_rtf].
 
 ## 🤯 Are you serious?
 
@@ -42,7 +43,7 @@ Really? 🧐
 Or, not sure if that's any better, implementing an HTTP REST API in plain
 PowerShell?!? 🫣
 
-### ✅ Yes. We. Are
+### ✅ Yes, we are
 
 *And the package name was chosen to reflect this.*
 
@@ -51,9 +52,9 @@ at all* an issue for us. Abysmal, as in: for every wrapped call a full (new)
 PowerShell process needs to be instantiated, usually taking something like 1-2
 seconds. ⏳
 
-The REST interface provides a much better performance, at the cost of some
-additional setup. If you're happy to take on this approach, the package offers a
-very smooth ride. 🎢🎡
+The REST / HTTP-RPC interface provides a much better performance, at the cost of
+some additional setup. If you're happy to take on this approach, the package
+offers a very smooth ride. 🎢🎡
 
 ## 🛠🚧 Installation
 
@@ -99,6 +100,9 @@ Service Wrapper)][www_winsw] but you may choose anything you like to launch the
 server process like NSSM, Scheduled Tasks 📅, homegrown dark magic 🪄🔮 or
 others.
 
+🧪 A more recent approach could be [Shawl][www_shawl] - let us know if you've
+tried it and how it went!
+
 To go with **WinSW** simply download the bundled version provided with each
 [PSyTricks release][www_releases]. Just look for the `.zip` asset having `REST`
 and `WinSW` in its name.
@@ -202,3 +206,4 @@ wrapper.set_maintenance(machine="vm42.vdi.example.xy", disable=False)
 [www_winsw]: https://github.com/winsw/winsw
 [www_releases]: https://github.com/imcf/psytricks/releases
 [www_rtf]: https://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven
+[www_shawl]: https://github.com/mtkennerly/shawl

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/pyproject.toml

@@ -1,11 +1,16 @@
-[tool.poetry]
-authors = ["Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>"]
+[project]
+name = "psytricks"
 description = "PowerShell Python Citrix Tricks."
-documentation = "https://imcf.one/apidocs/psytricks/psytricks.html"
+authors = [
+    { name = "Niko Ehrenfeuchter", email = "nikolaus.ehrenfeuchter@unibas.ch" },
+]
 license = "GPL-3.0-or-later"
-name = "psytricks"
 readme = "README.md"
-version = "2.2.0-a.2"
+dynamic = []
+version = "2.2.0-a.6"
+
+[tool.poetry]
+documentation = "https://imcf.one/apidocs/psytricks/psytricks.html"
 
 [tool.poetry.urls]
 "Changelog" = "https://github.com/imcf/psytricks/blob/main/CHANGELOG.md"
@@ -25,6 +30,9 @@ pylint = "^2.16.2"
 [tool.poetry.scripts]
 psytricks = "psytricks.cli:run_cli"
 
+[tool.poetry.requires-plugins]
+poetry-dynamic-versioning = { version = ">=1.0.0,<2.0.0", extras = ["plugin"] }
+
 [tool.poetry-dynamic-versioning]
 enable = false
 style = "semver"
@@ -38,8 +46,7 @@ folders = [
 
 [build-system]
 build-backend = "poetry_dynamic_versioning.backend"
-requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]
-
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
 
 [tool.ruff.lint]
 # exclude = [

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/src/psytricks/__init__.py

@@ -3,7 +3,7 @@
 .. include:: ../../CHANGELOG.md
 """
 
-__version__ = "2.2.0-a.2"
+__version__ = "2.2.0-a.6"
 
 # style exceptions for pdoc-include-only docstrings:
 # ruff: noqa: D400  (missing-trailing-period)

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/src/psytricks/__ps1__/psytricks-lib.ps1

@@ -5,7 +5,7 @@ Collection of functions and other definitions to be sourced by other scripts.
 #>
 
 # the version variable will be filled by poetry at build time:
-$Version = "2.2.0-a.2"
+$Version = "2.2.0-a.6"
 
 
 #region properties-selectors

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/src/psytricks/decoder.py

@@ -46,7 +46,12 @@ def parse_powershell_json(json_dict):
             ret[key] = datetime.fromtimestamp(int(epoch_ms[:10]))
         elif key in by_keyword:
             mapping = by_keyword[key]
-            mapped_value = mapping[value]
+            try:
+                mapped_value = mapping[value]
+            except KeyError as err:
+                mapped_value = f"undefined-mapping-{value}"
+                log.error(f"No mapping for value '{value}' - using '{mapped_value}'!")
+                log.trace(err)
             log.trace(f"{key}: {value} -> {mapped_value}")
             ret[key] = mapped_value
         else:

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/src/psytricks/mappings.py

@@ -9,7 +9,8 @@ The dicts defined here can be used to map the numerical values back to their
 descriptive names. The mapped names are corresponding to the ones described in
 the official Citrix CVAD 2203 developer docs (all transformed to lowercase):
 
-https://developer-docs.citrix.com/projects/citrix-virtual-apps-desktops-sdk/en/2203/
+https://developer-docs.citrix.com/en-us/citrix-virtual-apps-desktops-sdk/2203/
+https://developer-docs.citrix.com/en-us/citrix-virtual-apps-desktops-sdk/2507/
 """
 
 #######################################################################################
@@ -25,6 +26,8 @@ power_state = {
     7: "turningoff",
     8: "suspending",
     9: "resuming",
+    10: "notsupported",
+    11: "virtualmachinenotfound",
 }
 """A machine's *power status* (`Citrix.Broker.Admin.SDK.PowerState`).
 

{psytricks-2.2.0a2 → psytricks-2.2.0a6}/src/psytricks/wrapper.py

@@ -88,7 +88,7 @@ class ResTricksWrapper:
     @read_only.setter
     def read_only(self, value: bool) -> None:
         verb = "Enabling" if value else "Disabling"
-        log.debug(f"{verb}'read-only' mode.")
+        log.debug(f"{verb} 'read-only' mode.")
         self._read_only = value
 
     def connect(self):