vo-models 0.4.2.dev0__tar.gz → 0.4.3__tar.gz

{vo_models-0.4.2.dev0/vo_models.egg-info → vo_models-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vo-models
-Version: 0.4.2.dev0
+Version: 0.4.3
 Summary: Pydantic data models for IVOA protocols
 Author-email: Joshua Fraustro <jfraustro@stsci.edu>, MAST Archive Developers <archive@stsci.edu>
 Project-URL: Homepage, https://github.com/spacetelescope/vo-models
@@ -28,6 +28,7 @@ Requires-Dist: furo; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: toml; extra == "docs"
 Requires-Dist: sphinx_autodoc_typehints; extra == "docs"
+Dynamic: license-file
 
 # vo-models
 

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vo-models"
-version = "0.4.2.dev0"
+version = "0.4.3"
 authors = [
     {name = "Joshua Fraustro", email="jfraustro@stsci.edu"},
     {name = "MAST Archive Developers", email="archive@stsci.edu"}

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/tapregext/models.py

@@ -8,7 +8,6 @@ from vo_models.voresource.models import NSMAP as VORESOURCE_NSMAP
 from vo_models.voresource.models import Capability
 
 NSMAP = {
-    "xs": "http://www.w3.org/2001/XMLSchema",
     "vm": "http://www.ivoa.net/xml/VOMetadata/v0.1",
     "tr": "http://www.ivoa.net/xml/TAPRegExt/v1.0",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/uws/models.py

@@ -11,7 +11,6 @@ from vo_models.xlink import XlinkType
 NSMAP = {
     "uws": "http://www.ivoa.net/xml/UWS/v1.0",
     "xlink": "http://www.w3.org/1999/xlink",
-    "xsd": "http://www.w3.org/2001/XMLSchema",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/vodataservice/models.py

@@ -3,6 +3,7 @@
 TODO: This is an incomplete spec, covering only elements needed for VOSITables
 https://github.com/spacetelescope/vo-models/issues/17
 """
+
 from typing import Any, Literal, Optional
 from xml.sax.saxutils import escape
 
@@ -16,7 +17,6 @@ from vo_models.voresource.models import Interface
 
 NSMAP = {
     "": "http://www.ivoa.net/xml/VODataService/v1.1",
-    "xs": "http://www.w3.org/2001/XMLSchema",
     "vr": "http://www.ivoa.net/xml/VOResource/v1.0",
     "vs": "http://www.ivoa.net/xml/VODataService/v1.1",
     "stc": "http://www.ivoa.net/xml/STC/stc-v1.30.xsd",
@@ -99,7 +99,7 @@ class DataType(BaseXmlModel, tag="dataType", nsmap={"xsi": "http://www.w3.org/20
     value: str
 
 
-class TableParam(BaseXmlModel, ns="", tag="column"):
+class TableParam(BaseXmlModel, tag="column"):
     """A description of a table column.
 
     Parameters:
@@ -189,7 +189,7 @@ class TableParam(BaseXmlModel, ns="", tag="column"):
         return value
 
 
-class Table(BaseXmlModel, tag="table", ns="", skip_empty=True):
+class Table(BaseXmlModel, tag="table", ns="", nsmap={"": ""}, skip_empty=True):
     """A model representing a single table element.
 
     Parameters:
@@ -223,12 +223,12 @@ class Table(BaseXmlModel, tag="table", ns="", skip_empty=True):
     table_type: Optional[str] = attr(name="type", default=None)
 
     table_name: str = element(tag="name", ns="")
-    title: Optional[str] = element(tag="title", ns="", default=None)
-    description: Optional[str] = element(tag="description", ns="", default=None)
-    utype: Optional[str] = element(tag="utype", ns="", default=None)
-    nrows: Optional[int] = element(tag="nrows", gte=0, ns="", default=None)
-    column: Optional[list[TableParam]] = element(tag="column", ns="", default_factory=list)
-    foreign_key: Optional[list[ForeignKey]] = element(tag="foreignKey", ns="", default_factory=list)
+    title: Optional[str] = element(tag="title", default=None, ns="")
+    description: Optional[str] = element(tag="description", default=None, ns="")
+    utype: Optional[str] = element(tag="utype", default=None, ns="")
+    nrows: Optional[int] = element(tag="nrows", gte=0, default=None, ns="")
+    column: Optional[list[TableParam]] = element(tag="column", default_factory=list, ns="")
+    foreign_key: Optional[list[ForeignKey]] = element(tag="foreignKey", default_factory=list, ns="")
 
     def __init__(__pydantic_self__, **data: Any) -> None:
         """Escape any keys that are passed in."""
@@ -246,7 +246,7 @@ class Table(BaseXmlModel, tag="table", ns="", skip_empty=True):
         return value
 
 
-class TableSchema(BaseXmlModel, tag="schema", ns="", skip_empty=True):
+class TableSchema(BaseXmlModel, tag="schema", ns="", nsmap={"": ""}, skip_empty=True):
     """A detailed description of a logically related group of tables.
 
     Parameters:

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/voresource/models.py

@@ -1,4 +1,5 @@
 """Pydantic-xml models for IVOA schema VOResource-v1.1.xsd"""
+
 import datetime
 from typing import Literal, Optional
 
@@ -12,13 +13,12 @@ from vo_models.voresource.types import IdentifierURI, UTCTimestamp, ValidationLe
 
 NSMAP = {
     "vr": "http://www.ivoa.net/xml/VOResource/v1.0",
-    "xs": "http://www.w3.org/2001/XMLSchema",
     "vm": "http://www.ivoa.net/xml/VOMetadata/v0.1",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 
 
-class Validation(BaseXmlModel, nsmap=NSMAP):
+class Validation(BaseXmlModel):
     """A validation stamp combining a validation level and the ID of the validator.
 
     Parameters:
@@ -41,7 +41,7 @@ class Validation(BaseXmlModel, nsmap=NSMAP):
         return values
 
 
-class ResourceName(BaseXmlModel, nsmap=NSMAP):
+class ResourceName(BaseXmlModel):
     """The name of a potentially registered resource.
 
     That is, the entity referred to may have an associated identifier.
@@ -57,7 +57,7 @@ class ResourceName(BaseXmlModel, nsmap=NSMAP):
     ivo_id: Optional[IdentifierURI] = attr(name="ivo-id", default=None)
 
 
-class Date(BaseXmlModel, nsmap=NSMAP):
+class Date(BaseXmlModel):
     """A string indicating what the date refers to.
 
     The value of role should be taken from the vocabulary maintained at http://www.ivoa.net/rdf/voresource/date_role.
@@ -75,7 +75,7 @@ class Date(BaseXmlModel, nsmap=NSMAP):
     )
 
 
-class Source(BaseXmlModel, nsmap=NSMAP):
+class Source(BaseXmlModel):
     """A bibliographic reference from which the present resource is derived or extracted.
 
     Parameters:
@@ -90,7 +90,7 @@ class Source(BaseXmlModel, nsmap=NSMAP):
     format: Optional[str] = attr(name="format", default=None)
 
 
-class Rights(BaseXmlModel, nsmap=NSMAP):
+class Rights(BaseXmlModel):
     """A statement of usage conditions.
 
     This will typically include a license, which should be given as a full string
@@ -107,7 +107,7 @@ class Rights(BaseXmlModel, nsmap=NSMAP):
     rights_uri: Optional[networks.AnyUrl] = attr(name="rightsURI", default=None)
 
 
-class AccessURL(BaseXmlModel, nsmap=NSMAP):
+class AccessURL(BaseXmlModel):
     """The URL (or base URL) that a client uses to access the service.
 
     Parameters:
@@ -122,7 +122,7 @@ class AccessURL(BaseXmlModel, nsmap=NSMAP):
     use: Literal["full", "base", "dir"] = attr(name="use")
 
 
-class MirrorURL(BaseXmlModel, nsmap=NSMAP):
+class MirrorURL(BaseXmlModel):
     """A URL of a mirror (i.e., a functionally identical additional service interface) to
 
     Parameters:
@@ -136,7 +136,7 @@ class MirrorURL(BaseXmlModel, nsmap=NSMAP):
     title: Optional[str] = attr(name="title", default=None)
 
 
-class Contact(BaseXmlModel, nsmap=NSMAP):
+class Contact(BaseXmlModel):
     """Information allowing establishing contact, e.g., for purposes of support.
 
     Parameters:
@@ -175,7 +175,7 @@ class Contact(BaseXmlModel, nsmap=NSMAP):
         return values
 
 
-class Creator(BaseXmlModel, nsmap=NSMAP):
+class Creator(BaseXmlModel):
     """The entity (e.g. person or organisation) primarily responsible for creating something
 
     Parameters:
@@ -208,7 +208,7 @@ class Creator(BaseXmlModel, nsmap=NSMAP):
         return values
 
 
-class Relationship(BaseXmlModel, nsmap=NSMAP):
+class Relationship(BaseXmlModel):
     """A description of the relationship between one resource and one or more other resources.
 
     Parameters:
@@ -225,7 +225,7 @@ class Relationship(BaseXmlModel, nsmap=NSMAP):
     related_resource: list[ResourceName] = element(tag="relatedResource")
 
 
-class SecurityMethod(BaseXmlModel, nsmap=NSMAP):
+class SecurityMethod(BaseXmlModel):
     """A description of a security mechanism.
 
     This type only allows one to refer to the mechanism via a URI.  Derived types would allow for more metadata.
@@ -238,7 +238,7 @@ class SecurityMethod(BaseXmlModel, nsmap=NSMAP):
     standard_id: Optional[networks.AnyUrl] = attr(name="standardID", default=None)
 
 
-class Curation(BaseXmlModel, nsmap=NSMAP):
+class Curation(BaseXmlModel):
     """Information regarding the general curation of a resource
 
     Parameters:
@@ -265,7 +265,7 @@ class Curation(BaseXmlModel, nsmap=NSMAP):
     contact: list[Contact] = element(tag="contact")
 
 
-class Content(BaseXmlModel, nsmap=NSMAP):
+class Content(BaseXmlModel):
     """Information regarding the general content of a resource
 
     Parameters:
@@ -299,7 +299,7 @@ class Content(BaseXmlModel, nsmap=NSMAP):
     relationship: Optional[list[Relationship]] = element(tag="relationship", default_factory=list)
 
 
-class Interface(BaseXmlModel, tag="interface", nsmap=NSMAP):
+class Interface(BaseXmlModel, tag="interface"):
     """A description of a service interface.
 
     Since this type is abstract, one must use an Interface subclass to describe an actual interface denoting
@@ -326,7 +326,7 @@ class Interface(BaseXmlModel, tag="interface", nsmap=NSMAP):
 
     version: Optional[str] = attr(name="version", default=None)
     role: Optional[str] = attr(name="role", default=None)
-    type: Optional[str] = attr(name="type", default=None, ns="xsi")
+    type: Optional[str] = attr(name="type", default=None, ns="xsi", nsmap={"xsi": "http://www.w3.org/2001/XMLSchema-instance"})
 
     access_url: list[AccessURL] = element(tag="accessURL")
     mirror_url: Optional[list[MirrorURL]] = element(tag="mirrorURL", default_factory=list)
@@ -334,13 +334,13 @@ class Interface(BaseXmlModel, tag="interface", nsmap=NSMAP):
     test_querystring: Optional[str] = element(tag="testQueryString", default=None)
 
 
-class WebBrowser(Interface, nsmap=NSMAP):
+class WebBrowser(Interface):
     """A (form-based) interface intended to be accesed interactively by a user via a web browser."""
 
     type: Literal["vr:WebBrowser"] = attr(name="type", default="vr:WebBrowser", ns="xsi")
 
 
-class WebService(Interface, nsmap=NSMAP):
+class WebService(Interface):
     """A Web Service that is describable by a WSDL document.
 
     The accessURL element gives the Web Service's endpoint URL.
@@ -350,12 +350,14 @@ class WebService(Interface, nsmap=NSMAP):
             (element) - The location of the WSDL that describes this Web Service.
     """
 
-    type: Literal["vr:WebService"] = attr(name="type", default="vr:WebService", ns="xsi")
+    type: Literal["vr:WebService"] = attr(
+        name="type", default="vr:WebService", ns="xsi", nsmap={"xsi": "http://www.w3.org/2001/XMLSchema-instance"}
+    )
 
     wsdl_url: Optional[list[networks.AnyUrl]] = element(tag="wsdlURL", default_factory=list)
 
 
-class Resource(BaseXmlModel, nsmap=NSMAP):
+class Resource(BaseXmlModel):
     """Any entity or component of a VO application that is describable and
                         identifiable by an IVOA Identifier.
 
@@ -415,7 +417,7 @@ class Resource(BaseXmlModel, nsmap=NSMAP):
         return values
 
 
-class Organisation(Resource, nsmap=NSMAP):
+class Organisation(Resource):
     """A named group of one or more persons brought together to pursue participation in VO applications.
 
     Parameters:
@@ -430,7 +432,7 @@ class Organisation(Resource, nsmap=NSMAP):
     instrument: Optional[list[ResourceName]] = element(tag="instrument", default_factory=list)
 
 
-class Capability(BaseXmlModel, tag="capability", nsmap=NSMAP):
+class Capability(BaseXmlModel, tag="capability"):
     """A description of what the service does (in terms of context-specific behavior), and how to use it
     (in terms of an interface)
 
@@ -458,7 +460,7 @@ class Capability(BaseXmlModel, tag="capability", nsmap=NSMAP):
     interface: Optional[list[Interface]] = element(tag="interface", default_factory=list)
 
 
-class Service(Resource, nsmap=NSMAP):
+class Service(Resource):
     """A resource that can be invoked by a client to perform some action on its behalf.
 
     Parameters:

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/vosi/availability/models.py

@@ -8,7 +8,6 @@ from vo_models.voresource.types import UTCTimestamp
 
 NSMAP = {
     "": "http://www.ivoa.net/xml/VOSIAvailability/v1.0",
-    "xsd": "http://www.w3.org/2001/XMLSchema",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/vosi/capabilities/models.py

@@ -10,7 +10,6 @@ from vo_models.voresource.models import Capability
 
 NSMAP = {
     "vosi": "http://www.ivoa.net/xml/VOSICapabilities/v1.0",
-    "xsd": "http://www.w3.org/2001/XMLSchema",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
     "vs": "http://www.ivoa.net/xml/VODataService/v1.1",
 } | VORESOURCE_NSMAP
@@ -29,5 +28,6 @@ class VOSICapabilities(BaseXmlModel, tag="capabilities", ns="vosi", nsmap=NSMAP)
     capability: list[Union[TableAccess, Capability]] = element(
         tag="capability",
         ns="",
+        nsmap={"": ""},
         default=[],
     )

{vo_models-0.4.2.dev0 → vo_models-0.4.3}/vo_models/vosi/tables/models.py

@@ -5,7 +5,6 @@ NSMAP = {
     "vosi": "http://www.ivoa.net/xml/VOSITables/v1.0",
     "vr": "http://www.ivoa.net/xml/VOResource/v1.0",
     "vs": "http://www.ivoa.net/xml/VODataService/v1.1",
-    "xsd": "http://www.w3.org/2001/XMLSchema",
     "xsi": "http://www.w3.org/2001/XMLSchema-instance",
 }
 

{vo_models-0.4.2.dev0 → vo_models-0.4.3/vo_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: vo-models
-Version: 0.4.2.dev0
+Version: 0.4.3
 Summary: Pydantic data models for IVOA protocols
 Author-email: Joshua Fraustro <jfraustro@stsci.edu>, MAST Archive Developers <archive@stsci.edu>
 Project-URL: Homepage, https://github.com/spacetelescope/vo-models
@@ -28,6 +28,7 @@ Requires-Dist: furo; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: toml; extra == "docs"
 Requires-Dist: sphinx_autodoc_typehints; extra == "docs"
+Dynamic: license-file
 
 # vo-models