forked from astropy/pyvo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also, new method set_services on _ImageDiscoverer to pass in a custom resource list (for now, for testability) Also, exposing RegistryResource and RegistryResults in the registry API; they're really central in using the stuff, and we'll need them in type annotations a lot.
- Loading branch information
Showing
9 changed files
with
141 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -135,3 +135,4 @@ Using `pyvo` | |
io/index | ||
auth/index | ||
utils/prototypes | ||
utils/testing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
...ta/sia1-responses/GET-dc.zah.uni-heidelberg.de-siap.xml_intersect=['over-VQN20JIanSxbrIwk
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file added
BIN
+1.72 KB
...a1-responses/GET-dc.zah.uni-heidelberg.de-siap.xml_intersect=['over-VQN20JIanSxbrIwk.meta
Binary file not shown.
21 changes: 21 additions & 0 deletions
21
...scover/tests/data/sia1-responses/POST-reg.g-vo.org-sync_LANG=ADQL&QUERY=-FLW0oQODrCtVUdcJ
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<?xml version='1.0' encoding='utf-8'?> | ||
<VOTABLE version="1.4" xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ivoa.net/xml/VOTable/v1.3 http://vo.ari.uni-heidelberg.de/docs/schemata/VOTable-1.4.xsd"><RESOURCE type="results"><INFO name="sql_query" value="SELECT ivoid, res_type, short_name, res_title, content_level, res_description, reference_url, creator_seq, content_type, source_format, source_value, region_of_regard, waveband, string_agg(COALESCE ( access_url , '' ), ':::py VO sep:::') AS access_urls, string_agg(COALESCE ( standard_id , '' ), ':::py VO sep:::') AS standard_ids, string_agg(COALESCE ( intf_type , '' ), ':::py VO sep:::') AS intf_types, string_agg(COALESCE ( intf_role , '' ), ':::py VO sep:::') AS intf_roles FROM rr.resource NATURAL LEFT OUTER JOIN rr.capability NATURAL LEFT OUTER JOIN rr.interface WHERE ( ivoid = 'ivo://org.gavo.dc/bgds/q/sia' ) GROUP BY ivoid , res_type , short_name , res_title , content_level , res_description , reference_url , creator_seq , content_type , source_format , source_value , region_of_regard , waveband LIMIT 20000">ADQL query translated to local SQL (for debugging)</INFO><INFO name="query" value="SELECT | ||
ivoid, res_type, short_name, res_title, content_level, res_description, reference_url, creator_seq, content_type, source_format, source_value, region_of_regard, waveband, | ||
ivo_string_agg(COALESCE(access_url, ''), ':::py VO sep:::') AS access_urls, | ||
ivo_string_agg(COALESCE(standard_id, ''), ':::py VO sep:::') AS standard_ids, | ||
ivo_string_agg(COALESCE(intf_type, ''), ':::py VO sep:::') AS intf_types, | ||
ivo_string_agg(COALESCE(intf_role, ''), ':::py VO sep:::') AS intf_roles | ||
FROM | ||
rr.resource | ||
NATURAL LEFT OUTER JOIN rr.capability | ||
NATURAL LEFT OUTER JOIN rr.interface | ||
WHERE | ||
(ivoid = 'ivo://org.gavo.dc/bgds/q/sia') | ||
GROUP BY | ||
ivoid, res_type, short_name, res_title, content_level, res_description, reference_url, creator_seq, content_type, source_format, source_value, region_of_regard, waveband">Original ADQL query</INFO><INFO name="QUERY_STATUS" value="OK">Query successful</INFO><INFO name="server_software" value="DaCHS/2.8.1 twistedWeb/20.3.0">Software that produced this VOTable</INFO><INFO name="server" value="http://dc.zah.uni-heidelberg.de">Base URI of the server</INFO><INFO name="citation" ucd="" value="http://dc.zah.uni-heidelberg.de/__system__/tap/run/howtocite">Advice on citing this resource</INFO><INFO name="citation" ucd="" value="http://dc.zah.uni-heidelberg.de/tableinfo/rr.resource#ti-citing">Advice on citing this resource</INFO><INFO name="citation" ucd="" value="http://dc.zah.uni-heidelberg.de/tableinfo/rr.interface#ti-citing">Advice on citing this resource</INFO><INFO name="citation" ucd="" value="http://dc.zah.uni-heidelberg.de/tableinfo/rr.capability#ti-citing">Advice on citing this resource</INFO><INFO name="ivoid" ucd="meta.ref.ivoid" value="ivo://org.gavo.dc/__system__/tap/run">Originating VO resource</INFO><INFO name="publisher" value="The GAVO DC team">Data centre that has delivered the data</INFO><INFO name="request_date" ucd="time.creation" value="2023-10-24T08:31:27Z"></INFO><INFO name="contact" ucd="meta.email" value="[email protected]">Contact option</INFO><INFO name="reference_url" ucd="meta.ref.url" value="http://dc.zah.uni-heidelberg.de/__system__/tap/run/info">More information on the data Source</INFO><INFO name="reference_url" ucd="meta.ref.url" value="http://dc.zah.uni-heidelberg.de/tableinfo/rr.resource">More information on the data Source</INFO><INFO name="reference_url" ucd="meta.ref.url" value="http://dc.zah.uni-heidelberg.de/tableinfo/rr.interface">More information on the data Source</INFO><INFO name="reference_url" ucd="meta.ref.url" value="http://dc.zah.uni-heidelberg.de/tableinfo/rr.capability">More information on the data Source</INFO><INFO name="creator" ucd="meta.bib.author" value="GAVO Data Center">Name of a person or entity that produced a contributing resource</INFO><TABLE name="resource_capability_interface"><GROUP ID="ndhaiaghgmpa" name="note-cl"><DESCRIPTION> | ||
The terms are taken from the vocabulary | ||
http://ivoa.net/rdf/voresource/content_level.</DESCRIPTION><FIELDref ref="content_level"/></GROUP><GROUP ID="ndhaiaghgnoa" name="note-ct"><DESCRIPTION> | ||
The terms are taken from the vocabulary | ||
http://ivoa.net/rdf/voresource/content_type.</DESCRIPTION><FIELDref ref="content_type"/></GROUP><GROUP ID="ndhaiaghgmea" name="note-w"><DESCRIPTION> | ||
The allowed values for waveband include: | ||
Radio, Millimeter, Infrared, Optical, UV, EUV, X-ray, Gamma-ray.</DESCRIPTION><FIELDref ref="waveband"/></GROUP><FIELD ID="ivoid" arraysize="*" datatype="char" name="ivoid" utype="xpath:identifier"><DESCRIPTION>Unambiguous reference to the resource conforming to the IVOA standard for identifiers.</DESCRIPTION></FIELD><FIELD ID="res_type" arraysize="*" datatype="char" name="res_type" utype="xpath:@xsi:type"><DESCRIPTION>Resource type (something like vg:authority, vs:catalogservice, etc).</DESCRIPTION></FIELD><FIELD ID="short_name" arraysize="*" datatype="char" name="short_name" utype="xpath:shortName"><DESCRIPTION>A short name or abbreviation given to something, for presentation in space-constrained fields (up to 16 characters).</DESCRIPTION></FIELD><FIELD ID="res_title" arraysize="*" datatype="unicodeChar" name="res_title" utype="xpath:title"><DESCRIPTION>The full name given to the resource.</DESCRIPTION></FIELD><FIELD ID="content_level" arraysize="*" datatype="char" name="content_level" utype="xpath:content/contentLevel"><DESCRIPTION>A hash-separated list of content levels specifying the intended audience.</DESCRIPTION></FIELD><FIELD ID="res_description" arraysize="*" datatype="unicodeChar" name="res_description" utype="xpath:content/description"><DESCRIPTION>An account of the nature of the resource.</DESCRIPTION></FIELD><FIELD ID="reference_url" arraysize="*" datatype="char" name="reference_url" utype="xpath:content/referenceURL"><DESCRIPTION>URL pointing to a human-readable document describing this resource.</DESCRIPTION></FIELD><FIELD ID="creator_seq" arraysize="*" datatype="unicodeChar" name="creator_seq" utype="xpath:curation/creator/name"><DESCRIPTION>The creator(s) of the resource in the order given by the resource record author, separated by semicolons.</DESCRIPTION></FIELD><FIELD ID="content_type" arraysize="*" datatype="char" name="content_type" utype="xpath:content/type"><DESCRIPTION>A hash-separated list of natures or genres of the content of the resource.</DESCRIPTION></FIELD><FIELD ID="source_format" arraysize="*" datatype="char" name="source_format" utype="xpath:content/source/@format"><DESCRIPTION>The format of source_value. This, in particular, can be ``bibcode''.</DESCRIPTION></FIELD><FIELD ID="source_value" arraysize="*" datatype="unicodeChar" name="source_value" utype="xpath:content/source"><DESCRIPTION>A bibliographic reference from which the present resource is derived or extracted.</DESCRIPTION></FIELD><FIELD ID="region_of_regard" datatype="float" name="region_of_regard" unit="deg" utype="xpath:coverage/regionOfRegard"><DESCRIPTION>A single numeric value representing the angle, given in decimal degrees, by which a positional query against this resource should be ``blurred'' in order to get an appropriate match.</DESCRIPTION></FIELD><FIELD ID="waveband" arraysize="*" datatype="char" name="waveband" utype="xpath:coverage/waveband"><DESCRIPTION>A hash-separated list of regions of the electro-magnetic spectrum that the resource's spectral coverage overlaps with.</DESCRIPTION></FIELD><FIELD ID="access_urls" arraysize="*" datatype="char" name="access_urls"/><FIELD ID="standard_ids" arraysize="*" datatype="char" name="standard_ids"/><FIELD ID="intf_types" arraysize="*" datatype="char" name="intf_types"/><FIELD ID="intf_roles" arraysize="*" datatype="char" name="intf_roles"/><DATA><BINARY><STREAM encoding="base64">AAAAHGl2bzovL29yZy5nYXZvLmRjL2JnZHMvcS9zaWEAAAARdnM6Y2F0YWxvZ3NlcnZpY2UAAAAIYmdkcyBzaWEAAAApAEIAbwBjAGgAdQBtACAARwBhAGwAYQBjAHQAaQBjACAARABpAHMAawAgAFMAdQByAHYAZQB5ACAAKABCAEcARABTACkAIABpAG0AYQBnAGUAcwAAAAhyZXNlYXJjaAAAAgsAVABoAGUAIABCAG8AYwBoAHUAbQAgAEcAYQBsAGEAYwB0AGkAYwAgAEQAaQBzAGsAIABTAHUAcgB2AGUAeQAgAGkAcwAgAGEAbgAgAG8AbgBnAG8AaQBuAGcAIABwAHIAbwBqAGUAYwB0ACAAdABvACAAbQBvAG4AaQB0AG8AcgAgAHQAaABlAAoAcwB0AGUAbABsAGEAcgAgAGMAbwBuAHQAZQBuAHQAIABvAGYAIAB0AGgAZQAgAEcAYQBsAGEAYwB0AGkAYwAgAGQAaQBzAGsAIABpAG4AIABhACAANgAgAGQAZQBnAHIAZQBlACAAdwBpAGQAZQAgAHMAdAByAGkAcABlAAoAYwBlAG4AdABlAHIAZQBkACAAbwBuACAAdABoAGUAIABHAGEAbABhAGMAdABpAGMAIABwAGwAYQBuAGUALgAgAFQAaABlACAAZABhAHQAYQAgAGgAYQBzACAAYgBlAGUAbgAgAHIAZQBjAG8AcgBkAGUAZAAgAHMAaQBuAGMAZQAKAG0AaQBkAC0AMgAwADEAMAAgAGkAbgAgAFMAbABvAGEAbgAgAHIAIABhAG4AZAAgAGkAIABzAGkAbQB1AGwAdABhAG4AZQBvAHUAcwBsAHkAIAB3AGkAdABoACAAdABoAGUAIABSAG8AQgBvAFQAVAAgAFQAZQBsAGUAYwBzAG8AcABlACAAYQB0AAoAdABoAGUAIABVAG4AaQB2AGUAcgBzAGkAdABhAGUAdABzAHMAdABlAHIAbgB3AGEAcgB0AGUAIABCAG8AYwBoAHUAbQAgAG4AZQBhAHIAIABDAGUAcgByAG8AIABBAHIAbQBhAHoAbwBuAGUAcwAgAGkAbgAgAHQAaABlACAAQwBoAGkAbABlAGEAbgAKAEEAdABhAGMAYQBtAGEAIABkAGUAcwBlAHIAdAAuACAASQB0ACAAYwBvAG4AdABhAGkAbgBzACAAbQBlAGEAcwB1AHIAZQBtAGUAbgB0AHMAIABvAGYAIABhAGIAbwB1AHQAIAAyAHgAMQAwAF4ANwAgAHMAdABhAHIAcwAgAG8AdgBlAHIACgBtAG8AcgBlACAAdABoAGEAbgAgAHMAZQB2AGUAbgAgAHkAZQBhAHIAcwAuACAAQQBkAGQAaQB0AGkAbwBuAGEAbABsAHkALAAgAGkAbgB0AGUAcgBtAGkAdAB0AGUAbgB0ACAAbQBlAGEAcwB1AHIAZQBtAGUAbgB0AHMAIABpAG4ACgBKAG8AaABuAHMAbwBuACAAVQBWAEIAIABhAG4AZAAgAFMAbABvAGEAbgAgAHoAIABoAGEAdgBlACAAYgBlAGUAbgAgAHIAZQBjAG8AcgBkAGUAZAAgAGEAcwAgAHcAZQBsAGwALgAAAC9odHRwOi8vZGMuemFoLnVuaS1oZWlkZWxiZXJnLmRlL2JnZHMvcS9zaWEvaW5mbwAAACwASABhAGMAawBzAHQAZQBpAG4ALAAgAE0ALgA7ACAASABhAGEAcwAsACAATQAuADsAIABGAGUAaQBuACwAIABDAC4AOwAgAEMAaABpAG4AaQAsACAAUgAuAAAABnN1cnZleQAAAAdiaWJjb2RlAAAAEwAyADAAMQA1AEEATgAuAC4ALgAuADMAMwA2AC4ALgA1ADkAMABIf8AAAAAAAAdvcHRpY2FsAAAB6Wh0dHA6Ly9kYy56YWgudW5pLWhlaWRlbGJlcmcuZGUvYmdkcy9xL2RsL2RsbWV0YTo6OnB5IFZPIHNlcDo6Omh0dHA6Ly9kYy56YWgudW5pLWhlaWRlbGJlcmcuZGUvYmdkcy9xL2RsL2RsZ2V0Ojo6cHkgVk8gc2VwOjo6aHR0cDovL2RjLnphaC51bmktaGVpZGVsYmVyZy5kZS90YXA6OjpweSBWTyBzZXA6OjpodHRwOi8vZGMuemFoLnVuaS1oZWlkZWxiZXJnLmRlL2JnZHMvcS9zaWEvdGFibGVNZXRhZGF0YTo6OnB5IFZPIHNlcDo6Omh0dHA6Ly9kYy56YWgudW5pLWhlaWRlbGJlcmcuZGUvYmdkcy9xL3NpYS9jYXBhYmlsaXRpZXM6OjpweSBWTyBzZXA6OjpodHRwOi8vZGMuemFoLnVuaS1oZWlkZWxiZXJnLmRlL2JnZHMvcS9zaWEvYXZhaWxhYmlsaXR5Ojo6cHkgVk8gc2VwOjo6aHR0cDovL2RjLnphaC51bmktaGVpZGVsYmVyZy5kZS9CR0RTOjo6cHkgVk8gc2VwOjo6aHR0cDovL2RjLnphaC51bmktaGVpZGVsYmVyZy5kZS9iZ2RzL3Evc2lhL3NpYXAueG1sPwAAAURpdm86Ly9pdm9hLm5ldC9zdGQvZGF0YWxpbmsjbGlua3MtMS4xOjo6cHkgVk8gc2VwOjo6aXZvOi8vaXZvYS5uZXQvc3RkL3NvZGEjc3luYy0xLjA6OjpweSBWTyBzZXA6Ojppdm86Ly9pdm9hLm5ldC9zdGQvdGFwI2F1eDo6OnB5IFZPIHNlcDo6Oml2bzovL2l2b2EubmV0L3N0ZC92b3NpI3RhYmxlczo6OnB5IFZPIHNlcDo6Oml2bzovL2l2b2EubmV0L3N0ZC92b3NpI2NhcGFiaWxpdGllczo6OnB5IFZPIHNlcDo6Oml2bzovL2l2b2EubmV0L3N0ZC92b3NpI2F2YWlsYWJpbGl0eTo6OnB5IFZPIHNlcDo6Ojo6OnB5IFZPIHNlcDo6Oml2bzovL2l2b2EubmV0L3N0ZC9zaWEAAADKdnM6cGFyYW1odHRwOjo6cHkgVk8gc2VwOjo6dnM6cGFyYW1odHRwOjo6cHkgVk8gc2VwOjo6dnM6cGFyYW1odHRwOjo6cHkgVk8gc2VwOjo6dnM6cGFyYW1odHRwOjo6cHkgVk8gc2VwOjo6dnM6cGFyYW1odHRwOjo6cHkgVk8gc2VwOjo6dnM6cGFyYW1odHRwOjo6cHkgVk8gc2VwOjo6dnI6d2ViYnJvd3Nlcjo6OnB5IFZPIHNlcDo6OnZzOnBhcmFtaHR0cAAAAH5zdGQ6OjpweSBWTyBzZXA6OjpzdGQ6OjpweSBWTyBzZXA6OjpzdGQ6OjpweSBWTyBzZXA6OjpzdGQ6OjpweSBWTyBzZXA6OjpzdGQ6OjpweSBWTyBzZXA6OjpzdGQ6OjpweSBWTyBzZXA6Ojo6OjpweSBWTyBzZXA6OjpzdGQ=</STREAM></BINARY></DATA></TABLE></RESOURCE></VOTABLE> |
Binary file added
BIN
+2.57 KB
...r/tests/data/sia1-responses/POST-reg.g-vo.org-sync_LANG=ADQL&QUERY=-FLW0oQODrCtVUdcJ.meta
Binary file not shown.
Oops, something went wrong.