From df5bd3f83e02817f0de2a4f25482d458efa4b22f Mon Sep 17 00:00:00 2001 From: Abdu Zoghbi Date: Tue, 21 Feb 2023 17:59:37 -0500 Subject: [PATCH 1/3] add constraints into to registry.search --- pyvo/registry/regtap.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pyvo/registry/regtap.py b/pyvo/registry/regtap.py index a074f1f4c..c9ab7e41d 100644 --- a/pyvo/registry/regtap.py +++ b/pyvo/registry/regtap.py @@ -122,6 +122,36 @@ def search(*constraints: rtcons.Constraint, includeaux: bool = False, maxrec: in *constraints : `rtcons.Constraint` instances The constraints (keywords to match, positions to cover, ...) that the returned records need to satisfy. + The accepted constraints are: + + - keywords: one or more freetext words, mached in the title, + description or subject of the resource. + - servicetype: constrain to one of tap, ssa, sia, conesearch + (or full ivoids for other service types). This is the + constraint you want to use for service discovery. + - ucd: constrain by one or more UCD patterns; resources match + when they serve columns having a matching UCD + (e.g., phot.mag;em.ir.% for "any infrared magnitude"). + - waveband: one or more terms from the vocabulary at + http://www.ivoa.net/rdf/messenger giving the rough spectral + location of the resource. + - author: an author ("creator"). This is a single SQL pattern, + and given the sloppy practices in the VO for how to write + author names, you should probably generously use wildcards. + - datamodel: one of obscore, epntap, or regtap: only return TAP + services having tables of this kind. + - ivoid: exactly match a single IVOA identifier (that is, + in effect, the primary key in the VO). + - spatial: match resources covering a certain geometry (point, + circle, polygon, or MOC). RegTAP 1.2 Extension. + - spectral: match resources covering a certain part of the spectrum + (usually, but not limited to, the electromagnetic spectrum). + RegTAP 1.2 Extension + - temporal: match resources covering a some point or interval in + time. RegTAP 1.2 Extension + + Multiple constraints are combined conjunctively ("AND"). + includeaux : bool Flag for whether to include auxiliary capabilities in results. From e1b61627d90c2b9a717ae5b33a40981555873eda Mon Sep 17 00:00:00 2001 From: Abdu Zoghbi Date: Wed, 22 Feb 2023 09:17:08 -0500 Subject: [PATCH 2/3] fix white space --- pyvo/registry/regtap.py | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pyvo/registry/regtap.py b/pyvo/registry/regtap.py index c9ab7e41d..eea02503f 100644 --- a/pyvo/registry/regtap.py +++ b/pyvo/registry/regtap.py @@ -123,33 +123,33 @@ def search(*constraints: rtcons.Constraint, includeaux: bool = False, maxrec: in The constraints (keywords to match, positions to cover, ...) that the returned records need to satisfy. The accepted constraints are: - - - keywords: one or more freetext words, mached in the title, - description or subject of the resource. - - servicetype: constrain to one of tap, ssa, sia, conesearch - (or full ivoids for other service types). This is the - constraint you want to use for service discovery. - - ucd: constrain by one or more UCD patterns; resources match - when they serve columns having a matching UCD - (e.g., phot.mag;em.ir.% for "any infrared magnitude"). - - waveband: one or more terms from the vocabulary at - http://www.ivoa.net/rdf/messenger giving the rough spectral - location of the resource. - - author: an author ("creator"). This is a single SQL pattern, - and given the sloppy practices in the VO for how to write - author names, you should probably generously use wildcards. - - datamodel: one of obscore, epntap, or regtap: only return TAP - services having tables of this kind. - - ivoid: exactly match a single IVOA identifier (that is, - in effect, the primary key in the VO). - - spatial: match resources covering a certain geometry (point, - circle, polygon, or MOC). RegTAP 1.2 Extension. - - spectral: match resources covering a certain part of the spectrum - (usually, but not limited to, the electromagnetic spectrum). - RegTAP 1.2 Extension - - temporal: match resources covering a some point or interval in - time. RegTAP 1.2 Extension + - keywords: one or more freetext words, mached in the title, + description or subject of the resource. + - servicetype: constrain to one of tap, ssa, sia, conesearch + (or full ivoids for other service types). This is the + constraint you want to use for service discovery. + - ucd: constrain by one or more UCD patterns; resources match + when they serve columns having a matching UCD + (e.g., phot.mag;em.ir.% for "any infrared magnitude"). + - waveband: one or more terms from the vocabulary at + http://www.ivoa.net/rdf/messenger giving the rough spectral + location of the resource. + - author: an author ("creator"). This is a single SQL pattern, + and given the sloppy practices in the VO for how to write + author names, you should probably generously use wildcards. + - datamodel: one of obscore, epntap, or regtap: only return TAP + services having tables of this kind. + - ivoid: exactly match a single IVOA identifier (that is, + in effect, the primary key in the VO). + - spatial: match resources covering a certain geometry (point, + circle, polygon, or MOC). RegTAP 1.2 Extension. + - spectral: match resources covering a certain part of the spectrum + (usually, but not limited to, the electromagnetic spectrum). + RegTAP 1.2 Extension + - temporal: match resources covering a some point or interval in + time. RegTAP 1.2 Extension + Multiple constraints are combined conjunctively ("AND"). From 2bb3d54465a0147cdf5042849a764564ea0b4b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= Date: Wed, 22 Feb 2023 09:23:24 -0800 Subject: [PATCH 3/3] MAINT: fix whitespaces --- pyvo/registry/regtap.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pyvo/registry/regtap.py b/pyvo/registry/regtap.py index eea02503f..59f29fe20 100644 --- a/pyvo/registry/regtap.py +++ b/pyvo/registry/regtap.py @@ -123,33 +123,33 @@ def search(*constraints: rtcons.Constraint, includeaux: bool = False, maxrec: in The constraints (keywords to match, positions to cover, ...) that the returned records need to satisfy. The accepted constraints are: - + - keywords: one or more freetext words, mached in the title, - description or subject of the resource. + description or subject of the resource. - servicetype: constrain to one of tap, ssa, sia, conesearch - (or full ivoids for other service types). This is the - constraint you want to use for service discovery. + (or full ivoids for other service types). This is the + constraint you want to use for service discovery. - ucd: constrain by one or more UCD patterns; resources match - when they serve columns having a matching UCD - (e.g., phot.mag;em.ir.% for "any infrared magnitude"). + when they serve columns having a matching UCD + (e.g., phot.mag;em.ir.% for "any infrared magnitude"). - waveband: one or more terms from the vocabulary at - http://www.ivoa.net/rdf/messenger giving the rough spectral - location of the resource. + http://www.ivoa.net/rdf/messenger giving the rough spectral + location of the resource. - author: an author ("creator"). This is a single SQL pattern, - and given the sloppy practices in the VO for how to write - author names, you should probably generously use wildcards. + and given the sloppy practices in the VO for how to write + author names, you should probably generously use wildcards. - datamodel: one of obscore, epntap, or regtap: only return TAP - services having tables of this kind. + services having tables of this kind. - ivoid: exactly match a single IVOA identifier (that is, - in effect, the primary key in the VO). + in effect, the primary key in the VO). - spatial: match resources covering a certain geometry (point, - circle, polygon, or MOC). RegTAP 1.2 Extension. + circle, polygon, or MOC). RegTAP 1.2 Extension. - spectral: match resources covering a certain part of the spectrum - (usually, but not limited to, the electromagnetic spectrum). - RegTAP 1.2 Extension - - temporal: match resources covering a some point or interval in - time. RegTAP 1.2 Extension - + (usually, but not limited to, the electromagnetic spectrum). + RegTAP 1.2 Extension + - temporal: match resources covering a some point or interval in + time. RegTAP 1.2 Extension + Multiple constraints are combined conjunctively ("AND").