Skip to content

Commit acfc339

Browse files
committed
Hard-code licenses in the catalog
1 parent b0f94d6 commit acfc339

File tree

6 files changed

+34
-14
lines changed

6 files changed

+34
-14
lines changed

catalog/dags/providers/provider_api_scripts/cleveland_museum.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import logging
22

3-
from common.licenses import get_license_info
3+
from common.licenses import LicenseInfo
44
from common.loader import provider_details as prov
55
from providers.provider_api_scripts.provider_data_ingester import ProviderDataIngester
66

77

88
logger = logging.getLogger(__name__)
99

10-
CC0_LICENSE = get_license_info(license_="cc0", license_version="1.0")
10+
CC0_LICENSE = LicenseInfo(
11+
license="cc0",
12+
version="1.0",
13+
url="https://creativecommons.org/publicdomain/zero/1.0/",
14+
)
1115

1216

1317
class ClevelandDataIngester(ProviderDataIngester):

catalog/dags/providers/provider_api_scripts/metropolitan_museum.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import argparse
2929
import logging
3030

31-
from common.licenses import get_license_info
31+
from common.licenses import LicenseInfo
3232
from common.loader import provider_details as prov
3333
from providers.provider_api_scripts.provider_data_ingester import ProviderDataIngester
3434

@@ -42,7 +42,11 @@
4242
class MetMuseumDataIngester(ProviderDataIngester):
4343
providers = {"image": prov.METROPOLITAN_MUSEUM_DEFAULT_PROVIDER}
4444
endpoint = "https://collectionapi.metmuseum.org/public/collection/v1/objects"
45-
DEFAULT_LICENSE_INFO = get_license_info(license_="cc0", license_version="1.0")
45+
DEFAULT_LICENSE_INFO = LicenseInfo(
46+
license="cc0",
47+
version="1.0",
48+
url="https://creativecommons.org/publicdomain/zero/1.0/",
49+
)
4650

4751
def __init__(self, *args, **kwargs):
4852
super().__init__(*args, **kwargs)

catalog/dags/providers/provider_api_scripts/nappy.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import logging
1515

1616
from common import constants
17-
from common.licenses import get_license_info
17+
from common.licenses import LicenseInfo
1818
from common.loader import provider_details as prov
1919
from providers.provider_api_scripts.provider_data_ingester import ProviderDataIngester
2020

@@ -28,8 +28,11 @@ class NappyDataIngester(ProviderDataIngester):
2828
headers = {"Accept": "application/json"}
2929

3030
# Hardcoded to CC0, the only license Nappy.co uses
31-
license_info = get_license_info(
32-
"https://creativecommons.org/publicdomain/zero/1.0/"
31+
license_info = LicenseInfo(
32+
license="cc0",
33+
version="1.0",
34+
url="https://creativecommons.org/publicdomain/zero/1.0/",
35+
raw_url=None,
3336
)
3437

3538
def get_next_query_params(self, prev_query_params: dict | None) -> dict:

catalog/dags/providers/provider_api_scripts/science_museum.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828

2929
LIMIT = 100
3030

31-
CC0_LICENSE = get_license_info(license_="cc0", license_version="1.0")
31+
CC0_LICENSE = LicenseInfo(
32+
license="cc0",
33+
version="1.0",
34+
url="https://creativecommons.org/publicdomain/zero/1.0/",
35+
)
3236

3337

3438
class ScienceMuseumDataIngester(ProviderDataIngester):

catalog/dags/providers/provider_api_scripts/smithsonian.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from airflow.exceptions import AirflowException
1515
from airflow.models import Variable
1616

17-
from common.licenses import get_license_info
17+
from common.licenses import LicenseInfo
1818
from common.loader import provider_details as prov
1919
from providers.provider_api_scripts.provider_data_ingester import ProviderDataIngester
2020

@@ -110,8 +110,10 @@ def __init__(self, *args, **kwargs):
110110
super().__init__(*args, **kwargs)
111111
self.api_key = Variable.get("API_KEY_DATA_GOV")
112112
self.units_endpoint = f"{self.base_endpoint}terms/unit_code"
113-
self.license_info = get_license_info(
114-
license_url="https://creativecommons.org/publicdomain/zero/1.0/"
113+
self.license_info = LicenseInfo(
114+
license="cc0",
115+
version="1.0",
116+
url="https://creativecommons.org/publicdomain/zero/1.0/",
115117
)
116118

117119
def get_fixed_query_params(self):

catalog/tests/dags/providers/provider_api_scripts/test_nappy.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
)
55

66
from common.constants import IMAGE
7-
from common.licenses import get_license_info
7+
from common.licenses import LicenseInfo
88
from providers.provider_api_scripts.nappy import NappyDataIngester
99

1010

@@ -105,8 +105,11 @@ def test_get_should_continue(response_json, expected_result):
105105
{
106106
"foreign_landing_url": "https://nappy.co/photo/9/woman-with-tattoos",
107107
"url": "https://images.nappy.co/uploads/large/101591721349meykm7s6hvaswwvslpjrwibeyzru1fcxtxh0hf09cs7kdhmtptef4y3k4ua5z1bkyrbxov8tmagnafm8upwa3hxaxururtx7azaf.jpg",
108-
"license_info": get_license_info(
109-
"https://creativecommons.org/publicdomain/zero/1.0/"
108+
"license_info": LicenseInfo(
109+
license="cc0",
110+
version="1.0",
111+
url="https://creativecommons.org/publicdomain/zero/1.0/",
112+
raw_url=None,
110113
),
111114
"foreign_identifier": 9,
112115
"filesize": 233500,

0 commit comments

Comments
 (0)