Import from collections.abc instead of typing/collections (UP035)

ods/bin/model_switchboard/adapters.py

@@ -18,7 +18,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Protocol
+from typing import Any, Protocol
+from collections.abc import Callable
 
 
 def result(ok: bool, detail: str = "", **extras: Any) -> dict[str, Any]:

ods/bin/remote_provider/egress.py

@@ -11,7 +11,8 @@
 from dataclasses import dataclass
 from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Mapping
+from typing import Any
+from collections.abc import Mapping
 from urllib.parse import urlsplit, urlunsplit
 
 from .policy import (

ods/bin/remote_provider/reconciler.py

@@ -8,7 +8,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Protocol
+from typing import Any, Protocol
+from collections.abc import Callable
 
 
 PHASES = ("stage", "validate", "commit", "prove")

ods/bin/remote_provider/transport.py

@@ -9,7 +9,8 @@
 import re
 from dataclasses import dataclass
 from pathlib import PurePosixPath
-from typing import Any, Mapping
+from typing import Any
+from collections.abc import Mapping
 
 
 DEFAULT_SSH_IDENTITY_PATH = PurePosixPath("/state/remote-provider/secrets/ssh-identity")

ods/extensions/services/dashboard-api/config.py

@@ -5,7 +5,8 @@
 import os
 import re
 from pathlib import Path
-from typing import Any, Mapping
+from typing import Any
+from collections.abc import Mapping
 from urllib.parse import urlparse
 
 import yaml

ods/extensions/services/dashboard-api/hermes_bridge.py

@@ -34,7 +34,8 @@
 import re
 import time
 from dataclasses import dataclass, field
-from typing import Any, AsyncIterator
+from typing import Any
+from collections.abc import AsyncIterator
 
 import aiohttp
 

ods/extensions/services/dashboard-api/lemonade_client.py

@@ -4,7 +4,8 @@
 
 import os
 from dataclasses import dataclass
-from typing import Any, Mapping, Optional, Sequence
+from typing import Any, Optional
+from collections.abc import Mapping, Sequence
 
 import httpx
 

ods/extensions/services/dashboard-api/routers/remote_provider_status.py

@@ -7,7 +7,8 @@
 import logging
 import os
 from pathlib import Path
-from typing import Any, Mapping
+from typing import Any
+from collections.abc import Mapping
 from urllib.parse import quote, urlsplit, urlunsplit
 
 import httpx

ods/extensions/services/dashboard-api/routers/talk.py

@@ -14,7 +14,8 @@
 import json
 import logging
 import os
-from typing import Any, AsyncIterator
+from typing import Any
+from collections.abc import AsyncIterator
 
 import httpx
 from fastapi import APIRouter, File, Form, HTTPException, Request, UploadFile

ods/extensions/services/model-router/app/main.py

@@ -34,7 +34,8 @@
 import uuid
 from collections import OrderedDict
 from pathlib import Path
-from typing import Any, AsyncIterator
+from typing import Any
+from collections.abc import AsyncIterator
 
 import httpx
 from fastapi import FastAPI, Request, Response

ods/extensions/services/remote-provider-egress/app/main.py

@@ -10,7 +10,8 @@
 import os
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, AsyncIterator, Mapping
+from typing import Any
+from collections.abc import AsyncIterator, Mapping
 
 import httpx
 from fastapi import FastAPI, Request, Response

ods/extensions/services/remote-provider-ssh-tunnel/app/main.py

@@ -10,7 +10,8 @@
 import time
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from pathlib import Path
-from typing import Any, Callable, Mapping, Sequence
+from typing import Any
+from collections.abc import Callable, Mapping, Sequence
 
 from remote_provider.ssh_supervisor import (
     SSH_SUPERVISOR_PLAN_SCHEMA,

ods/scripts/check-dependency-pins.py

@@ -13,7 +13,7 @@
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterable
+from collections.abc import Iterable
 
 
 ROOT = Path(__file__).resolve().parents[1]

ods/scripts/healthcheck.py

@@ -54,7 +54,8 @@
 import urllib.error
 import urllib.request
 from dataclasses import dataclass
-from typing import List, Optional, Sequence, Set, Tuple
+from typing import List, Optional, Set, Tuple
+from collections.abc import Sequence
 
 
 # -----------------------------

ods/scripts/render-runtime-configs.py

@@ -18,7 +18,7 @@
 import time
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import Callable
+from collections.abc import Callable
 
 
 ROOT = Path(__file__).resolve().parents[1]

ods/scripts/validate-sim-summary.py

@@ -32,7 +32,8 @@
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Dict, List, Mapping, Optional, Sequence, Union
+from typing import Any, Dict, List, Optional, Union
+from collections.abc import Mapping, Sequence
 
 Json = Union[None, bool, int, float, str, List["Json"], Dict[str, "Json"]]
 

ods/tests/contracts/test-remote-provider-ssh-tunnel-service.py

@@ -9,7 +9,7 @@
 import sys
 import tempfile
 from pathlib import Path
-from typing import Iterator
+from collections.abc import Iterator
 
 
 ROOT = Path(__file__).resolve().parents[2]