models: big refactor

app/terraform/block_bridge_github.py

@@ -4,7 +4,7 @@ from dateutil.parser import isoparse
 from github import Github
 
 from app import app
-from app.models import Bridge
+from app.models.bridges import Bridge
 
 
 def check_blocks():

app/terraform/block_external.py

@@ -2,7 +2,7 @@ from bs4 import BeautifulSoup
 import requests
 
 from app import app
-from app.models import Proxy
+from app.models.mirrors import Proxy
 
 
 def check_blocks():

app/terraform/block_ooni.py

@@ -7,7 +7,8 @@ import requests
 
 from app import app
 from app.extensions import db
-from app.models import Origin, AlarmState, Alarm
+from app.models.alarms import Alarm, AlarmState
+from app.models.mirrors import Proxy
 
 
 def check_origin(domain_name: str):

app/terraform/bridge/__init__.py

@@ -2,7 +2,8 @@ import datetime
 
 from app import app
 from app.extensions import db
-from app.models import BridgeConf, Bridge, Group
+from app.models.bridges import BridgeConf, Bridge
+from app.models.base import Group
 from app.terraform import BaseAutomation
 
 

app/terraform/eotk.py

@@ -1,5 +1,5 @@
 from app import app
-from app.models import Group
+from app.models.base import Group
 from app.terraform import BaseAutomation
 
 

app/terraform/list/__init__.py

@@ -2,7 +2,7 @@ import json
 
 from app import app
 from app.mirror_sites import bridgelines, mirror_sites, mirror_mapping
-from app.models import MirrorList
+from app.models.base import MirrorList
 from app.terraform import BaseAutomation
 
 

app/terraform/proxy/__init__.py

@@ -2,7 +2,8 @@ import datetime
 
 from app import app
 from app.extensions import db
-from app.models import Group, Origin, Proxy
+from app.models.base import Group
+from app.models.mirrors import Origin, Proxy
 from app.terraform import BaseAutomation
 
 

app/terraform/proxy/azure_cdn.py

@@ -9,7 +9,9 @@ import tldextract
 from app import app
 from app.alarms import get_proxy_alarm
 from app.extensions import db
-from app.models import Group, Proxy, Alarm, AlarmState
+from app.models.base import Group
+from app.models.mirrors import Proxy
+from app.models.alarms import AlarmState
 from app.terraform.proxy import ProxyAutomation
 
 

app/terraform/proxy/cloudfront.py

@@ -8,7 +8,8 @@ import boto3
 from app import app
 from app.alarms import get_proxy_alarm
 from app.extensions import db
-from app.models import Proxy, Alarm, AlarmState
+from app.models.alarms import Alarm, AlarmState
+from app.models.mirrors import Proxy
 from app.terraform.proxy import ProxyAutomation
 
 

app/terraform/proxy/fastly.py

@@ -8,7 +8,8 @@ import tldextract
 
 from app import app
 from app.extensions import db
-from app.models import Group, Origin, Proxy
+from app.models.base import Group
+from app.models.mirrors import Origin, Proxy
 
 TEMPLATE = """
 terraform {

app/terraform/proxy_check.py

@@ -2,7 +2,8 @@ import requests
 
 from app import app
 from app.extensions import db
-from app.models import AlarmState, Alarm, Proxy
+from app.models.alarms import Alarm, AlarmState
+from app.models.mirrors import Proxy
 
 
 def set_http_alarm(proxy_id: int, state: AlarmState, text: str):