replace parametercontext

Author: mboot-github

CLAUDE_TODO

@@ -3,34 +3,21 @@
 # TLD regex database compiled eagerly at import
 whoisdomain/helpers.py · lines 99–100
 
-Importing whoisdomain forces processing all 3,000+ lines of ZZ immediately. Consumers who only need one TLD pay the cost of all of them. Make MY_TLD_INFO lazy — initialize on first call to get_TLD_RE() or filterTldToSupportedPattern(). Bonus: significantly faster python -c "import whoisdomain", which matters for CLI tools and lambdas.
-
----
-
-# ParameterContext is a JSON-parsed config rather than a dataclass
-whoisdomain/context/parameterContext.py
-
-A 150-line JSON literal is parsed at import to define ~25 parameters, then __getattr__ returns Any for every read. mypy can't help you, IDE autocomplete can't help your users, and the validation code (~80 lines) duplicates what @dataclass(slots=True) + __post_init__ would give you for free. Sketch:
-
-@dataclass(slots=True)
-class ParameterContext:
-    cmd: str = "whois"
-    timeout: float = 30.0
-    cache_age: int = 60 * 60 * 48
-    verbose: bool = False
-    rdap_only: bool = False
-    # ... etc
-    def to_json(self) -> str: return json.dumps(asdict(self))
-    @classmethod
-    def from_json(cls, s: str) -> "ParameterContext":
-        return cls(**json.loads(s))
+Importing whoisdomain forces processing all 3,000+ lines of ZZ immediately.
+Consumers who only need one TLD pay the cost of all of them.
+Make MY_TLD_INFO lazy — initialize on first call to get_TLD_RE() or filterTldToSupportedPattern().
+Bonus: significantly faster python -c "import whoisdomain", which matters for CLI tools and lambdas.
 
 ---
 
 # Module-level mutable globals everywhere
 helpers.py:99, doWhoisCommand.py:20, lastWhois.py:21, main.py:550
 
-MY_TLD_INFO, CACHE_STUB, LastWhois, and a 14-name global declaration in main(). This makes the package effectively a singleton — concurrent users (e.g. an async webapp) will fight over state, and tests can't run in parallel. Move shared state onto a Whois client class that callers instantiate, and keep the module-level helpers as thin wrappers around a default instance for backwards compatibility.
+MY_TLD_INFO, CACHE_STUB, LastWhois, and a 14-name global declaration in main().
+This makes the package effectively a singleton — concurrent users (e.g. an async webapp) will fight over state,
+  and tests can't run in parallel.
+Move shared state onto a Whois client class that callers instantiate,
+  and keep the module-level helpers as thin wrappers around a default instance for backwards compatibility.
 
 ---
 

whoisdomain/__init__.py

@@ -156,7 +156,7 @@ def remoteQ2(
                 print("remoteQ2:Receive:", request, file=sys.stderr)
 
             pc: ParameterContext = ParameterContext()
-            pc.fromJson(request["pc"])
+            pc.from_json(request["pc"])
 
             # call the func
             allOk = True

whoisdomain/context/parameterContext.py

@@ -6,6 +6,95 @@
 
 log = logging.getLogger(__name__)
 
+
+@dataclass(slots=True)
+class ParameterContext:
+    # currently no params are mandatory
+
+    # if the whois command fails with code 1 still process the data returned as normal.
+    ignore_returncode: bool = False
+
+    # Don't use cache.
+    force: bool = False
+
+    # bla bla
+    verbose: bool = False
+
+    # cleanup lines starting with % and REDACTED FOR PRIVACY
+    with_cleanup_results: bool = False
+
+    # if true convert with internationalizedDomainNameToPunyCode()
+    internationalized: bool = False
+
+    # if reqested the full response is also returned.
+    include_raw_whois_text: bool = False
+
+    # as it says
+    return_raw_text_for_unsupported_tld: bool = False
+
+    # try to parse partial response when cmd timed out
+    #  (stdbuf should be in PATH for best results)
+    parse_partial_response: bool = False
+
+    # when simplistic is true,
+    #  we return null for most exceptions and dont pass info why we have no data.
+    simplistic: bool = False
+
+    # show redacted output default no redacted data is shown
+    withRedacted: bool = False
+
+    # specify the path to the cli whois you want to use.
+    cmd: str = "whois"
+
+    # specify the path to the cli whois you want to use.
+    cache_file: str | None = None
+
+    # use this whois server for making this query:
+    #   Linux/Mac: 'whois -h <server> <domain>'
+    #   Windows: 'whois.exe <domain> <server>'"
+    server: str | None = None
+
+    # Cache expiration time for given domain in seconds 60*60*48 (48 hours).
+    cache_age: int = 172800
+
+    # Time [s] it will wait after you query WHOIS database.
+    slow_down: int = 0
+
+    # timeout in seconds for the whois command to return a result.
+    timeout: float = 30.0
+
+    # allow auto install of sysinternals whois on windows if no whois found
+    tryInstallMissingWhoisOnWindows: bool = False
+
+    # The number of lines we consider a short response.
+    shortResponseLen: int = 5
+
+    # if lib 'tld' is installed add tld info based on get_tld(); fake the tld if needed
+    withPublicSuffix: bool = False
+
+    # try to extract the whois servers from the whois output (uses --verbose)
+    extractServers: bool = False
+
+    # strip https://icann.org/epp# from status response
+    stripHttpStatus: bool = False
+
+    # if set to true we skip the strip www action
+    noIgnoreWww: bool = False
+
+    # if set to true we only consult rdap
+    rdapOnly: bool = False
+
+    # if set to true we only consult whois
+    whoisOnly: bool = False
+
+    def to_json(self) -> str:
+        return json.dumps(asdict(self))
+
+    @classmethod
+    def from_json(cls, s: str) -> "ParameterContext":
+        return cls(**json.loads(s))
+
+
 ParamsStringJson: str = """
 {
   "ignore_returncode": {
@@ -156,84 +245,7 @@
 """
 
 
-@dataclass(slots=True)
 class ParameterContext2:
-    # if the whois command fails with code 1 still process the data returned as normal.
-    ignore_returncode: bool = False
-    # Don't use cache.
-    force: bool = False
-    verbose: bool = False
-    # cleanup lines starting with % and REDACTED FOR PRIVACY
-    with_cleanup_results: bool = False
-    # if true convert with internationalizedDomainNameToPunyCode()
-    internationalized: bool = False
-    # if reqested the full response is also returned.
-    include_raw_whois_text: bool = False
-    return_raw_text_for_unsupported_tld: bool = False
-    # try to parse partial response when cmd timed out
-    #  (stdbuf should be in PATH for best results)
-    parse_partial_response: bool = False
-
-    # when simplistic is true,
-    #  we return null for most exceptions and dont pass info why we have no data.
-    simplistic: bool = False
-
-    # show redacted output default no redacted data is shown
-    withRedacted: bool = False
-
-    # specify the path to the cli whois you want to use.
-    cmd: str = "whois"
-
-    # specify the path to the cli whois you want to use.
-    cache_file: str | None = None
-
-    # use this whois server for making this query:
-    #   Linux/Mac: 'whois -h <server> <domain>'
-    #   Windows: 'whois.exe <domain> <server>'"
-    server: str | None = None
-
-    # Cache expiration time for given domain in seconds 60*60*48 (48 hours).
-    cache_age: int = 172800
-
-    # Time [s] it will wait after you query WHOIS database.
-    slow_down: int = 0
-
-    # timeout in seconds for the whois command to return a result.
-    timeout: float = 30.0
-
-    # allow auto install of sysinternals whois on windows if no whois found
-    tryInstallMissingWhoisOnWindows: bool = False
-
-    # The number of lines we consider a short response.
-    shortResponseLen: int = 5
-
-    # if lib 'tld' is installed add tld info based on get_tld(); fake the tld if needed
-    withPublicSuffix: bool = False
-
-    # try to extract the whois servers from the whois output (uses --verbose)
-    extractServers: bool = False
-
-    # strip https://icann.org/epp# from status response
-    stripHttpStatus: bool = False
-
-    # if set to true we skip the strip www action
-    noIgnoreWww: bool = False
-
-    # if set to true we only consult rdap
-    rdapOnly: bool = False
-
-    # if set to true we only consult whois
-    whoisOnly: bool = False
-
-    def to_json(self) -> str:
-        return json.dumps(asdict(self))
-
-    @classmethod
-    def from_json(cls, s: str) -> "ParameterContext2":
-        return cls(**json.loads(s))
-
-
-class ParameterContext:
     kt: dict[str, Any]
     value: dict[str, Any]
     params: dict[str, Any]
@@ -355,13 +367,13 @@ def toJson(
 
     def fromJson(
         self,
-        jString: str,
+        jstring: str,
     ) -> None:
-        zz = json.loads(jString)
+        zz = json.loads(jstring)
         for k, v in zz.items():
             self.set(k, v)
 
 
 if __name__ == "__main__":
     pc = ParameterContext()
-    print(pc.value)
+    print(asdict(pc))

whoisdomain/procFunc.py

@@ -41,7 +41,7 @@ def oneItem(
         domain: str,
         pc: ParameterContext,
     ) -> Any:
-        jStr = pc.toJson()
+        jStr = pc.to_json()
 
         request: dict[str, Any] = {
             "domain": domain,