Merge pull request #401 from delph-in/change-requests-to-httpx

Change requests to httpx

Author: goodmami

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### Unreleased
 
+### Maintenance
+
+* Removed `requirements.txt`; it was unnecessary and out of date
+* Replaced `requests` dependency with `httpx`
+
 
 ## [v1.10.0]
 

CONTRIBUTING.md

@@ -19,7 +19,7 @@ Questions about PyDelphin can be asked on the [DELPH-IN Discourse
 site](https://delphinqa.ling.washington.edu/) in the "PyDelphin Tools"
 category.
 
-For bug requests, please provide the following, if possible:
+For bug reports, please provide the following, if possible:
 
 * a minimal working example
 * version of PyDelphin (and relevant dependencies)

delphin/dmrs/_operations.py

@@ -4,12 +4,12 @@
 """
 
 import warnings
-from typing import Callable, Dict, List, Optional, cast
+from typing import Callable, Optional, cast
 
 from delphin import dmrs, mrs, scope, variable
 
-_HCMap = Dict[str, mrs.HCons]
-_IdMap = Dict[str, int]
+_HCMap = dict[str, mrs.HCons]
+_IdMap = dict[str, int]
 
 
 def from_mrs(
@@ -32,7 +32,11 @@ def from_mrs(
         DMRSError when conversion fails.
     """
     hcmap: _HCMap = {hc.hi: hc for hc in m.hcons}
-    reps = scope.representatives(m, priority=representative_priority)
+    # TODO: fix type annotation with scope.representatives overloads?
+    reps = cast(
+        dict[str, list[mrs.EP]],
+        scope.representatives(m, priority=representative_priority)
+    )
     # EP id to node id map; create now to keep ids consistent
     id_to_nid: _IdMap = {ep.id: i
                          for i, ep in enumerate(m.rels, dmrs.FIRST_NODE_ID)}
@@ -83,7 +87,7 @@ def _mrs_get_top(
     return top
 
 
-def _mrs_to_nodes(m: mrs.MRS, id_to_nid: _IdMap) -> List[dmrs.Node]:
+def _mrs_to_nodes(m: mrs.MRS, id_to_nid: _IdMap) -> list[dmrs.Node]:
     nodes = []
     for ep in m.rels:
         node_id = id_to_nid[ep.id]
@@ -117,10 +121,10 @@ def _mrs_to_nodes(m: mrs.MRS, id_to_nid: _IdMap) -> List[dmrs.Node]:
 def _mrs_to_links(
         m: mrs.MRS,
         hcmap: _HCMap,
-        reps: scope.ScopeMap,
+        reps: dict[str, list[mrs.EP]],  # MRS-specific ScopeMap
         iv_to_nid: _IdMap,
         id_to_nid: _IdMap
-) -> List[dmrs.Link]:
+) -> list[dmrs.Link]:
     links = []
     # links from arguments
     for src, roleargs in m.arguments().items():

delphin/scope.py

@@ -2,7 +2,7 @@
 Structures and operations for quantifier scope in DELPH-IN semantics.
 """
 
-from typing import Dict, Iterable, List, Mapping, Optional, Tuple
+from typing import Iterable, Mapping, Optional
 
 # Default modules need to import the PyDelphin version
 from delphin.__about__ import __version__  # noqa: F401
@@ -29,11 +29,11 @@
 ScopeLabel = str
 ScopeRelation = str
 ScopeMap = Mapping[ScopeLabel, Predications]
-DescendantMap = Mapping[Identifier, List[Predication]]
-ScopalRoleArgument = Tuple[Role, ScopeRelation, Identifier]
-ScopalArgumentStructure = Mapping[Identifier, List[ScopalRoleArgument]]
+DescendantMap = Mapping[Identifier, list[Predication]]
+ScopalRoleArgument = tuple[Role, ScopeRelation, Identifier]
+ScopalArgumentStructure = Mapping[Identifier, list[ScopalRoleArgument]]
 # Regarding literal types, see: https://www.python.org/dev/peps/pep-0563/
-ScopeEqualities = Iterable[Tuple[ScopeLabel, ScopeLabel]]
+ScopeEqualities = Iterable[tuple[ScopeLabel, ScopeLabel]]
 
 
 # Exceptions
@@ -87,7 +87,7 @@ def scopal_arguments(self, scopes=None) -> ScopalArgumentStructure:
         """
         raise NotImplementedError()
 
-    def scopes(self) -> Tuple[ScopeLabel, ScopeMap]:
+    def scopes(self) -> tuple[ScopeLabel, ScopeMap]:
         """
         Return a tuple containing the top label and the scope map.
 
@@ -117,7 +117,7 @@ def conjoin(scopes: ScopeMap, leqs: ScopeEqualities) -> ScopeMap:
         >>> {lbl: [p.id for p in ps] for lbl, ps in conjoined.items()}
         {'h1': ['e2'], 'h2': ['x4', 'e6']}
     """
-    scopemap: Dict[ScopeLabel, List[Predication]] = {}
+    scopemap: dict[ScopeLabel, list[Predication]] = {}
     for component in _connected_components(list(scopes), leqs):
         chosen_label = next(iter(component))
         scopemap[chosen_label] = []
@@ -155,13 +155,13 @@ def descendants(x: ScopingSemanticStructure,
     if scopes is None:
         _, scopes = x.scopes()
     scargs = x.scopal_arguments(scopes=scopes)
-    descs: Dict[Identifier, List[Predication]] = {}
+    descs: dict[Identifier, list[Predication]] = {}
     for p in x.predications:
         _descendants(descs, p.id, scargs, scopes)
     return descs
 
 
-def _descendants(descs: Dict[Identifier, List[Predication]],
+def _descendants(descs: dict[Identifier, list[Predication]],
                  id: Identifier,
                  scargs: ScopalArgumentStructure,
                  scopes: ScopeMap) -> None:
@@ -203,7 +203,7 @@ def representatives(x: ScopingSemanticStructure, priority=None) -> ScopeMap:
 
     3. Prefer tensed over untensed eventualities
 
-    4. Finally, prefer prefer those appearing first in *x*
+    4. Finally, prefer those appearing first in *x*
 
     The definition of "tensed" vs "untensed" eventualities is
     grammar-specific, but it is used by several large grammars. If a
@@ -233,7 +233,7 @@ def representatives(x: ScopingSemanticStructure, priority=None) -> ScopeMap:
     descs = {id: set(d.id for d in ds)
              for id, ds in descendants(x, scopes).items()}
 
-    reps: Dict[ScopeLabel, List[Predication]] = {
+    reps: dict[ScopeLabel, list[Predication]] = {
         label: [] for label in scopes
     }
     for label, scope in scopes.items():

delphin/web/client.py

@@ -5,7 +5,7 @@
 
 from urllib.parse import urljoin
 
-import requests
+import httpx
 
 from delphin import interface
 
@@ -60,7 +60,7 @@ def interact(self, datum, params=None, headers=None):
             A Response containing the results, if the request was
             successful.
         Raises:
-            requests.HTTPError: if the status code was not 200
+            httpx.HTTPError: if the status code was not 200
         """
         if params is None:
             params = {}
@@ -71,11 +71,10 @@ def interact(self, datum, params=None, headers=None):
             hdrs.update(headers)
 
         url = urljoin(self.server, self.task)
-        r = requests.get(url, params=params, headers=hdrs)
-        if r.status_code == 200:
-            return _HTTPResponse(r.json())
-        else:
-            r.raise_for_status()
+        with httpx.Client() as client:
+            r = client.get(url, params=params, headers=hdrs)
+        r.raise_for_status()
+        return _HTTPResponse(r.json())
 
     def process_item(self, datum, keys=None, params=None, headers=None):
         """
@@ -132,7 +131,7 @@ def parse(input, server=DEFAULT_SERVER, params=None, headers=None):
         A Response containing the results, if the request was
         successful.
     Raises:
-        requests.HTTPError: if the status code was not 200
+        httpx.HTTPError: if the status code was not 200
     """
     return next(parse_from_iterable([input], server, params, headers), None)
 
@@ -154,7 +153,7 @@ def parse_from_iterable(
     Yields:
         Response objects for each successful response.
     Raises:
-        requests.HTTPError: for the first response with a status code
+        httpx.HTTPError: for the first response with a status code
             that is not 200
     """
     client = Parser(server)
@@ -176,7 +175,7 @@ def generate(input, server=DEFAULT_SERVER, params=None, headers=None):
         A Response containing the results, if the request was
         successful.
     Raises:
-        requests.HTTPError: if the status code was not 200
+        httpx.HTTPError: if the status code was not 200
     """
     return next(generate_from_iterable([input], server, params, headers), None)
 
@@ -198,7 +197,7 @@ def generate_from_iterable(
     Yields:
         Response objects for each successful response.
     Raises:
-        requests.HTTPError: for the first response with a status code
+        httpx.HTTPError: for the first response with a status code
             that is not 200
     """
     client = Generator(server)

delphin/web/server.py

@@ -37,7 +37,7 @@ def configure(api, parser=None, generator=None, testsuites=None):
     :class:`GenerationServer` instances directly.
 
     Args:
-        api: an instance of :class:`falcon.API`
+        api: an instance of :class:`falcon.App`
         parser: a path to a grammar or a :class:`ParseServer` instance
         generator: a path to a grammar or a :class:`GenerationServer`
             instance

docs/api/delphin.web.client.rst

@@ -11,7 +11,7 @@ servers that implement the DELPH-IN Web API described here:
 
 .. note::
 
-   Requires `requests` (https://pypi.python.org/pypi/requests). This
+   Requires `httpx` (https://www.python-httpx.org/). This
    dependency is satisfied if you install PyDelphin with the ``[web]``
    extra (see :doc:`../guides/setup`).
 

docs/api/delphin.web.server.rst

@@ -29,7 +29,7 @@ such as the following example:
 
    from delphin.web import server
 
-   application = falcon.API()
+   application = falcon.App()
 
    server.configure(
        application,

docs/conf.py

@@ -187,7 +187,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
-    'requests': ('https://requests.readthedocs.io/en/master/', None),
+    # 'httpx': ('https://www.python-httpx.org/', None),
     'falcon': ('https://falcon.readthedocs.io/en/2.0.0/', None)
 }
 

docs/guides/setup.rst

@@ -28,7 +28,7 @@ Module or Function                 Dependencies  Notes
 =================================  ============  ===========================
 :mod:`delphin.ace`                 ACE_          Linux and Mac only
 :mod:`delphin.highlight`           Pygments_
-:mod:`delphin.web.client`          requests_     ``[web]`` extra
+:mod:`delphin.web.client`          httpx_        ``[web]`` extra
 :mod:`delphin.web.server`          Falcon_       ``[web]`` extra
 :mod:`delphin.codecs.dmrspenman`   Penman_
 :mod:`delphin.codecs.edspenman`    Penman_
@@ -41,7 +41,7 @@ are not listed in the table above).
 
 .. _ACE: http://sweaglesw.org/linguistics/ace/
 .. _Pygments: https://pygments.org/
-.. _requests: http://python-requests.org/
+.. _httpx: https://www.python-httpx.org/
 .. _Falcon: https://falcon.readthedocs.io/
 .. _Penman: https://github.com/goodmami/penman
 .. _regex: https://bitbucket.org/mrabarnett/mrab-regex/