jageocoder 2.1.9.dev2__tar.gz → 2.1.9.dev3__tar.gz

{jageocoder-2.1.9.dev2 → jageocoder-2.1.9.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jageocoder
-Version: 2.1.9.dev2
+Version: 2.1.9.dev3
 Summary: A Japanese-address geocoder for Python.
 Home-page: https://github.com/t-sagara/jageocoder/
 License: The MIT License

{jageocoder-2.1.9.dev2 → jageocoder-2.1.9.dev3}/jageocoder/__init__.py

@@ -19,7 +19,7 @@ running the following steps.
     >>> jageocoder.searchNode('<Japanese-address>')
 """
 
-__version__ = '2.1.9.dev2'  # The package version
+__version__ = '2.1.9.dev3'  # The package version
 __dictionary_version__ = '20230927'  # Compatible dictionary version
 __author__ = 'Takeshi Sagara <sagara@info-proto.com>'
 

{jageocoder-2.1.9.dev2 → jageocoder-2.1.9.dev3}/jageocoder/remote.py

@@ -2,10 +2,12 @@ from __future__ import annotations
 import json
 from logging import getLogger
 import os
-import requests
+import re
 from typing import Any, List, NoReturn, Optional
 import uuid
 
+import requests
+
 from jageocoder.address import AddressLevel
 from jageocoder.exceptions import RemoteTreeException
 from jageocoder.node import AddressNode
@@ -249,8 +251,8 @@ class RemoteTree(AddressTree):
 
         - target_area: List[str] (Default = [])
             Specify the areas to be searched.
-            The area can be specified by the list of name of the node
-            (such as prefecture name or city name), or JIS code.
+            The area can be specified by the list of JIS code of the node.
+            Note: Can't specify by node names when using remote server, currently.
 
         - auto_redirect: bool (default = True)
             When this option is set and the retrieved node has a
@@ -261,6 +263,38 @@ class RemoteTree(AddressTree):
             self.validate_config(key=k, value=v)
             self.config[k] = v
 
+    def validate_config(self, key: str, value: Any) -> None:
+        """
+        Validate configuration key and parameters.
+
+        Parameters
+        ----------
+        key: str
+            The name of the parameter.
+        value: str, int, bool, None
+            The value to be set to the parameter.
+
+        Notes
+        -----
+        If the key-value pair is not valid, raise RuntimeError.
+        """
+        if key == 'target_area':
+            if value in (None, []):
+                return
+
+            if isinstance(value, str):
+                value = [value]
+
+            for v in value:
+                if re.match(r'\d{2}', v) or re.match(r'\d{5}', v):
+                    return
+
+                msg = "'{}' is not a valid value for {}.".format(v, key)
+                raise RuntimeError(msg)
+
+        else:
+            return
+
     def json_request(
             self,
             method: str,

{jageocoder-2.1.9.dev2 → jageocoder-2.1.9.dev3}/jageocoder/tree.py

@@ -402,22 +402,26 @@ class AddressTree(object):
             if value in (None, []):
                 return
 
-            if re.match(r'\d{2}', value) or re.match(r'\d{5}', value):
-                return
+            if isinstance(value, str):
+                value = [value]
 
-            # Check if the value is a name of node in the database.
-            std = self.converter.standardize(value)
-            candidates = self.trie.common_prefixes(std)
-            if std in candidates:
-                trie_node_id = candidates[std]
-                for node_id in self.trie_nodes.get_record(
-                        pos=trie_node_id).nodes:
-                    node = self.address_nodes.get_record(pos=node_id)
-                    if node.name == value:
-                        return
-
-            msg = "'{}' is not a valid value for {}.".format(value, key)
-            raise RuntimeError(msg)
+            for v in value:
+                if re.match(r'\d{2}', v) or re.match(r'\d{5}', v):
+                    return
+
+                # Check if the value is a name of node in the database.
+                std = self.converter.standardize(v)
+                candidates = self.trie.common_prefixes(std)
+                if std in candidates:
+                    trie_node_id = candidates[std]
+                    for node_id in self.trie_nodes.get_record(
+                            pos=trie_node_id).nodes:
+                        node = self.address_nodes.get_record(pos=node_id)
+                        if node.name == v:
+                            return
+
+                msg = "'{}' is not a valid value for {}.".format(v, key)
+                raise RuntimeError(msg)
 
         else:
             return

{jageocoder-2.1.9.dev2 → jageocoder-2.1.9.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jageocoder"
-version = "2.1.9.dev2"
+version = "2.1.9.dev3"
 description = "A Japanese-address geocoder for Python."
 authors = ["Takeshi Sagara <sagara@info-proto.com>"]
 repository = "https://github.com/t-sagara/jageocoder/"