remove a lot of if type_checking; fix model_rebuild errors. Remove all network models/managers/test/fixtures

8 files changed, 0 insertions, 378 deletions

diff --git a/tests/managers/network/__init__.py b/tests/managers/network/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/managers/network/__init__.py
+++ /dev/null
diff --git a/tests/managers/network/test_label.py b/tests/managers/network/test_label.py
deleted file mode 100644
index abdd28f..0000000
--- a/tests/managers/network/test_label.py
+++ /dev/null
@@ -1,209 +0,0 @@
-import ipaddress
-from datetime import datetime
-from typing import TYPE_CHECKING
-
-import faker
-import pytest
-from psycopg.errors import UniqueViolation
-from pydantic import ValidationError
-
-from generalresearch.models.network.label import (
-    IPLabel,
-    IPLabelKind,
-    IPLabelMetadata,
-    IPLabelSource,
-)
-from generalresearch.models.thl.ipinfo import normalize_ip
-
-if TYPE_CHECKING:
-    from generalresearch.managers.network.label import IPLabelManager
-
-fake = faker.Faker()
-
-
-@pytest.fixture
-def ip_label(utc_now: datetime) -> IPLabel:
-    ip = ipaddress.IPv6Network((fake.ipv6(), 64), strict=False)
-    return IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip,
-        metadata=IPLabelMetadata(services=["RDP"]),
-    )
-
-
-def test_model(utc_now: datetime):
-    ip = fake.ipv4_public()
-    lbl = IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip,
-    )
-    assert lbl.ip.prefixlen == 32
-    print(f"{lbl.ip=}")
-
-    ip = ipaddress.IPv4Network((ip, 24), strict=False)
-    lbl = IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip,
-    )
-    print(f"{lbl.ip=}")
-
-    with pytest.raises(ValidationError, match="IPv6 network must be /64 or larger"):
-        IPLabel(
-            label_kind=IPLabelKind.VPN,
-            labeled_at=utc_now,
-            source=IPLabelSource.INTERNAL_USE,
-            provider="GeoNodE",
-            created_at=utc_now,
-            ip=fake.ipv6(),
-        )
-
-    ip = ipaddress.IPv6Network((fake.ipv6(), 64), strict=False)
-    lbl = IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip,
-    )
-    print(f"{lbl.ip=}")
-
-    ip = ipaddress.IPv6Network((ip.network_address, 48), strict=False)
-    lbl = IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip,
-    )
-    print(f"{lbl.ip=}")
-
-
-def test_create(iplabel_manager: IPLabelManager, ip_label: IPLabel):
-    iplabel_manager.create(ip_label)
-
-    with pytest.raises(
-        UniqueViolation, match="duplicate key value violates unique constraint"
-    ):
-        iplabel_manager.create(ip_label)
-
-
-def test_filter(iplabel_manager: IPLabelManager, ip_label: IPLabel, utc_hour_ago):
-    res = iplabel_manager.filter(ips=[ip_label.ip])
-    assert len(res) == 0
-
-    iplabel_manager.create(ip_label)
-    res = iplabel_manager.filter(ips=[ip_label.ip])
-    assert len(res) == 1
-
-    out = res[0]
-    assert out == ip_label
-
-    res = iplabel_manager.filter(ips=[ip_label.ip], labeled_after=utc_hour_ago)
-    assert len(res) == 1
-
-    ip_label2 = ip_label.model_copy()
-    ip_label2.ip = fake.ipv4_public()
-    iplabel_manager.create(ip_label2)
-    res = iplabel_manager.filter(ips=[ip_label.ip, ip_label2.ip])
-    assert len(res) == 2
-
-
-def test_filter_network(
-    iplabel_manager: IPLabelManager, ip_label: IPLabel, utc_hour_ago
-):
-    print(ip_label)
-    ip_label = ip_label.model_copy()
-    ip_label.ip = ipaddress.IPv6Network((fake.ipv6(), 64), strict=False)
-
-    iplabel_manager.create(ip_label)
-    res = iplabel_manager.filter(ips=[ip_label.ip])
-    assert len(res) == 1
-
-    out = res[0]
-    assert out == ip_label
-
-    res = iplabel_manager.filter(ips=[ip_label.ip], labeled_after=utc_hour_ago)
-    assert len(res) == 1
-
-    ip_label2 = ip_label.model_copy()
-    ip_label2.ip = fake.ipv4_public()
-    iplabel_manager.create(ip_label2)
-    res = iplabel_manager.filter(ips=[ip_label.ip, ip_label2.ip])
-    assert len(res) == 2
-
-
-def test_network(iplabel_manager: IPLabelManager, utc_now: datetime):
-    # This is a fully-specific /128 ipv6 address.
-    # e.g. '51b7:b38d:8717:6c5b:cd3e:f5c3:3aba:17d'
-    ip = fake.ipv6()
-    # Generally, we'd want to annotate the /64 network
-    # e.g. '51b7:b38d:8717:6c5b::/64'
-    ip_64 = ipaddress.IPv6Network((ip, 64), strict=False)
-
-    label = IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip_64,
-    )
-    iplabel_manager.create(label)
-
-    # If I query for the /128 directly, I won't find it
-    res = iplabel_manager.filter(ips=[ip])
-    assert len(res) == 0
-
-    # If I query for the /64 network I will
-    res = iplabel_manager.filter(ips=[ip_64])
-    assert len(res) == 1
-
-    # Or, I can query for the /128 ip IN a network
-    res = iplabel_manager.filter(ip_in_network=ip)
-    assert len(res) == 1
-
-
-def test_label_cidr_and_ipinfo(
-    iplabel_manager: IPLabelManager,
-    ip_information_factory,
-    ip_geoname,
-    utc_now: datetime,
-):
-    # We have network_iplabel.ip as a cidr col and
-    # thl_ipinformation.ip as a inet col. Make sure we can join appropriately
-    ip = fake.ipv6()
-    ip_information_factory(ip=ip, geoname=ip_geoname)
-    # We normalize for storage into ipinfo table
-    ip_norm, _ = normalize_ip(ip)
-
-    # Test with a larger network
-    ip_48 = ipaddress.IPv6Network((ip, 48), strict=False)
-    print(f"{ip=}")
-    print(f"{ip_norm=}")
-    print(f"{ip_48=}")
-    label = IPLabel(
-        label_kind=IPLabelKind.VPN,
-        labeled_at=utc_now,
-        source=IPLabelSource.INTERNAL_USE,
-        provider="GeoNodE",
-        created_at=utc_now,
-        ip=ip_48,
-    )
-    iplabel_manager.create(label)
-
-    res = iplabel_manager.test_join(ip_norm)
-    print(res)
diff --git a/tests/managers/network/test_tool_run.py b/tests/managers/network/test_tool_run.py
deleted file mode 100644
index a815809..0000000
--- a/tests/managers/network/test_tool_run.py
+++ /dev/null
@@ -1,25 +0,0 @@
-def test_create_tool_run_from_nmap_run(nmap_run, toolrun_manager):
-
-    toolrun_manager.create_nmap_run(nmap_run)
-
-    run_out = toolrun_manager.get_nmap_run(nmap_run.id)
-
-    assert nmap_run == run_out
-
-
-def test_create_tool_run_from_rdns_run(rdns_run, toolrun_manager):
-
-    toolrun_manager.create_rdns_run(rdns_run)
-
-    run_out = toolrun_manager.get_rdns_run(rdns_run.id)
-
-    assert rdns_run == run_out
-
-
-def test_create_tool_run_from_mtr_run(mtr_run, toolrun_manager):
-
-    toolrun_manager.create_mtr_run(mtr_run)
-
-    run_out = toolrun_manager.get_mtr_run(mtr_run.id)
-
-    assert mtr_run == run_out
diff --git a/tests/models/network/__init__.py b/tests/models/network/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/models/network/__init__.py
+++ /dev/null
diff --git a/tests/models/network/test_mtr.py b/tests/models/network/test_mtr.py
deleted file mode 100644
index 5d136c4..0000000
--- a/tests/models/network/test_mtr.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import faker
-
-from generalresearch.models.network.mtr.execute import execute_mtr
-from generalresearch.models.network.tool_run import ToolClass, ToolName
-
-if TYPE_CHECKING:
-    from generalresearch.managers.network.tool_run import ToolRunManager
-
-fake = faker.Faker()
-
-
-def test_execute_mtr(toolrun_manager: ToolRunManager):
-    ip = "65.19.129.53"
-
-    run = execute_mtr(ip=ip, report_cycles=3)
-    assert run.tool_name == ToolName.MTR
-    assert run.tool_class == ToolClass.TRACEROUTE
-    assert run.ip == ip
-    result = run.parsed
-
-    last_hop = result.hops[-1]
-    assert last_hop.asn == 6939
-    assert last_hop.domain == "grlengine.com"
-
-    last_hop_1 = result.hops[-2]
-    assert last_hop_1.asn == 6939
-    assert last_hop_1.domain == "he.net"
-
-    toolrun_manager.create_mtr_run(run)
diff --git a/tests/models/network/test_nmap.py b/tests/models/network/test_nmap.py
deleted file mode 100644
index 6adc9e4..0000000
--- a/tests/models/network/test_nmap.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from __future__ import annotations
-
-import subprocess
-from typing import TYPE_CHECKING
-
-import faker
-
-from generalresearch.models.network.definitions import IPProtocol
-from generalresearch.models.network.nmap.execute import execute_nmap
-from generalresearch.models.network.nmap.result import NmapResult, PortState
-from generalresearch.models.network.tool_run import ToolClass, ToolName
-
-if TYPE_CHECKING:
-    from generalresearch.managers.network.tool_run import ToolRunManager
-    from generalresearch.models.network.tool_run import NmapRun
-
-fake = faker.Faker()
-
-
-def resolve(host: str):
-    return subprocess.check_output(["dig", host, "+short"]).decode().strip()
-
-
-def test_execute_nmap_scanme(toolrun_manager: ToolRunManager):
-    ip = resolve("scanme.nmap.org")
-
-    run: NmapRun = execute_nmap(
-        ip=ip, top_ports=None, ports="20-30", enable_advanced=False
-    )
-    assert run.tool_name == ToolName.NMAP
-    assert run.tool_class == ToolClass.PORT_SCAN
-    assert run.ip == ip
-    assert isinstance(run.parsed, NmapResult)
-    result = run.parsed
-
-    port22 = result._port_index[(IPProtocol.TCP, 22)]
-    assert port22.state == PortState.OPEN
-
-    toolrun_manager.create_nmap_run(run)
diff --git a/tests/models/network/test_nmap_parser.py b/tests/models/network/test_nmap_parser.py
deleted file mode 100644
index fc9884b..0000000
--- a/tests/models/network/test_nmap_parser.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from __future__ import annotations
-
-import os
-from typing import TYPE_CHECKING
-
-import pytest
-
-from generalresearch.models.network.nmap.parser import parse_nmap_xml
-from generalresearch.models.network.nmap.result import NmapTrace
-
-if TYPE_CHECKING:
-    from generalresearch.models.network.nmap.result import NmapResult
-
-
-@pytest.fixture
-def nmap_raw_output_2(request) -> str:
-    fp = os.path.join(request.config.rootpath, "data/nmaprun2.xml")
-    with open(fp) as f:
-        data = f.read()
-    return data
-
-
-def test_nmap_xml_parser(nmap_raw_output: str, nmap_raw_output_2: str):
-    n: NmapResult = parse_nmap_xml(nmap_raw_output)
-    assert n.tcp_open_ports == [61232]
-
-    assert isinstance(n.trace, NmapTrace)
-    assert len(n.trace.hops) == 18
-
-    n = parse_nmap_xml(nmap_raw_output_2)
-    assert n.tcp_open_ports == [22, 80, 9929, 31337]
-    assert n.trace is None
diff --git a/tests/models/network/test_rdns.py b/tests/models/network/test_rdns.py
deleted file mode 100644
index 82126dd..0000000
--- a/tests/models/network/test_rdns.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import faker
-
-from generalresearch.models.network.rdns.execute import execute_rdns
-from generalresearch.models.network.tool_run import ToolClass, ToolName
-
-if TYPE_CHECKING:
-    from generalresearch.managers.network.tool_run import ToolRunManager
-
-fake = faker.Faker()
-
-
-def test_execute_rdns_grl(toolrun_manager: ToolRunManager):
-    ip = "65.19.129.53"
-    run = execute_rdns(ip=ip)
-    assert run.tool_name == ToolName.DIG
-    assert run.tool_class == ToolClass.RDNS
-    assert run.ip == ip
-    result = run.parsed
-    assert result.primary_hostname == "in1-smtp.grlengine.com"
-    assert result.primary_domain == "grlengine.com"
-    assert result.hostname_count == 1
-
-    toolrun_manager.create_rdns_run(run)
-
-
-def test_execute_rdns_none(toolrun_manager: ToolRunManager):
-    ip = fake.ipv6()
-    run = execute_rdns(ip)
-    result = run.parsed
-
-    assert result.primary_hostname is None
-    assert result.primary_domain is None
-    assert result.hostname_count == 0
-    assert result.hostnames == []
-
-    toolrun_manager.create_rdns_run(run)