lockss-pybasic 0.3.0.dev7__py3-none-any.whl → 0.3.0.dev9__py3-none-any.whl

lockss/pybasic/__init__.py

@@ -36,4 +36,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.3.0-dev7'
+__version__ = '0.3.0-dev9'

lockss/pybasic/cliutil.py

@@ -35,11 +35,11 @@ Command line utilities.
 from pathlib import Path
 from typing import Any, Optional, TypeAlias, Union
 
-from click_extra import ChoiceSource, EnumChoice, ExtraContext, HelpExtraFormatter, IntRange, ParamType, Path, Style, TableFormat, option
+from click_extra import ChoiceSource, EnumChoice, ExtraContext, HelpExtraFormatter, IntRange, ParamType, Path as _ClickPath, Style, TableFormat, option
 from click_extra.theme import get_default_theme
 
 
-ClickPath: TypeAlias = Path
+ClickPath: TypeAlias = _ClickPath
 
 
 def click_path(spec: Optional[str]) -> ClickPath:

lockss/pybasic/nodeutil.py

@@ -77,8 +77,7 @@ class BaseNodeSpec(BaseModel):
     kind: NodeSpecKind = Field(title='Kind',
                                description="This object's kind")
 
-    id: NodeIdentifier = Field(default='',
-                               title='Node Identifier',
+    id: NodeIdentifier = Field(title='Node Identifier',
                                description='An identifier for the node')
 
     protocol: NodeProtocolEnum = Field(default=DEFAULT_PROTOCOL,
@@ -99,9 +98,6 @@ class NodeSpec1(BaseNodeSpec):
                            title='UI Port',
                            description="The LOCKSS 1.x node's Web user interface port")
 
-    def __str__(self) -> str:
-        return f'{self.protocol.value}://{self.host}:{self.ui}'
-
 
 class NodeSpec2(BaseNodeSpec):
 
@@ -143,9 +139,6 @@ class NodeSpec2(BaseNodeSpec):
                              title='SOAP Port',
                              description="The node's SOAP Compatibility Service REST API Port")
 
-    def __str__(self) -> str:
-        return f'{self.protocol.value}://{self.host}:{self.repository}:{self.configuration}:{self.poller}:{self.crawler}:{self.metadata}:{self.soap}'
-
 
 _RE_COMPACT_NODE_SPEC: Pattern[str] = re.compile(r'((?P<protocol>https?)://)?(?P<host>[^:]+)(:(?P<repository>\d+|(?=:))(:(?P<configuration>\d+|(?=:))(:(?P<poller>\d+|(?=:))(:(?P<crawler>\d+|(?=:))(:(?P<metadata>\d+|(?=:))(:(?P<soap>\d+))?)?)?)?)?)?')
 
@@ -158,7 +151,7 @@ def _parse_compact_node_spec(compact_node_spec: CompactNodeSpec) -> dict[str, st
     mat: Optional[Match[str]] = _RE_COMPACT_NODE_SPEC.fullmatch(compact_node_spec)
     if mat is None:
         raise ValueError(f'Invalid compact node specification: {compact_node_spec}')
-    d = dict(kind='NodeSpec', host=mat.group('host'))
+    d = dict(kind='NodeSpec', id=compact_node_spec, host=mat.group('host'))
     if prot := mat.group('protocol'):
         d['protocol'] = prot
     five = ('configuration', 'poller', 'crawler', 'metadata', 'soap')

{lockss_pybasic-0.3.0.dev7.dist-info → lockss_pybasic-0.3.0.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockss-pybasic
-Version: 0.3.0.dev7
+Version: 0.3.0.dev9
 Summary: Basic Python utilities
 License: BSD-3-Clause
 License-File: LICENSE
@@ -26,7 +26,8 @@ Description-Content-Type: text/x-rst
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.3.0-dev7
+.. |RELEASE| replace:: 0.3.0-dev9
+
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)

lockss_pybasic-0.3.0.dev9.dist-info/RECORD

@@ -0,0 +1,10 @@
+lockss/pybasic/__init__.py,sha256=PzRiPQxQWcbr8KgvRR7fHa3h96AJFlBHje5AcqsCGQM,1678
+lockss/pybasic/auidutil.py,sha256=Q4vjjGfymiXVwPu35RyyLZBnViv8mDJKCjOyJb-sbS8,13921
+lockss/pybasic/cliutil.py,sha256=ExFIvNd30iSFmHY6wjkYNBOKA_E9WWlKQnPEV0-J0Ws,8150
+lockss/pybasic/errorutil.py,sha256=4EaO0a1yIG1DbWltASeT15bg1bGg5kOYspsW0iJdVLc,1951
+lockss/pybasic/fileutil.py,sha256=P_XW_UX6hVvP45vRV8fduclbGmoFflW83a6ZfFE-8Hc,2966
+lockss/pybasic/nodeutil.py,sha256=-MSCS79JMAgoja00lTs0ycHUbI5JJHvCCQMRXOyB-fc,8293
+lockss_pybasic-0.3.0.dev9.dist-info/METADATA,sha256=hl9G2gCBELw6c_bIWZZQJB45B14HkG-7crYG1SB566c,2495
+lockss_pybasic-0.3.0.dev9.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+lockss_pybasic-0.3.0.dev9.dist-info/licenses/LICENSE,sha256=EOxPunNz3XP6AjgbPFolu-d9BS_AF9TtKn1WXgeYPsE,1506
+lockss_pybasic-0.3.0.dev9.dist-info/RECORD,,

lockss_pybasic-0.3.0.dev7.dist-info/RECORD

@@ -1,10 +0,0 @@
-lockss/pybasic/__init__.py,sha256=ZIyfi5xRB64qEsAYeunV-bjQpeIq8u_ei8ejkBouSrE,1678
-lockss/pybasic/auidutil.py,sha256=Q4vjjGfymiXVwPu35RyyLZBnViv8mDJKCjOyJb-sbS8,13921
-lockss/pybasic/cliutil.py,sha256=-o5YIh5JPDxwyZ61U9iZshsmzYwOHW-HHFa2ndFO__g,8130
-lockss/pybasic/errorutil.py,sha256=4EaO0a1yIG1DbWltASeT15bg1bGg5kOYspsW0iJdVLc,1951
-lockss/pybasic/fileutil.py,sha256=P_XW_UX6hVvP45vRV8fduclbGmoFflW83a6ZfFE-8Hc,2966
-lockss/pybasic/nodeutil.py,sha256=XyR5yQ2TaRDLXc255QP3Wc4zgREu8keIQy9fsm1_jkE,8590
-lockss_pybasic-0.3.0.dev7.dist-info/METADATA,sha256=-jT1NZ46ArWsuC1T1ETcHi4wDRwTQDv_A_3J8QSf2gM,2494
-lockss_pybasic-0.3.0.dev7.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
-lockss_pybasic-0.3.0.dev7.dist-info/licenses/LICENSE,sha256=EOxPunNz3XP6AjgbPFolu-d9BS_AF9TtKn1WXgeYPsE,1506
-lockss_pybasic-0.3.0.dev7.dist-info/RECORD,,