Fix the imports to no longer rely on pyat and instead the broken out data packages

services/archive/services/client_services/data_quality_notes.py

@@ -6,7 +6,7 @@ from pyramid.view import view_config
 
 from . import def_name
 
-from pyat.schema.model import ScienceProductComment, ProblemSeverityList, ProblemType
+from schema.model import ScienceProductComment, ProblemSeverityList, ProblemType
 from services import DB
 from sqlalchemy import exc as sa_exc, asc, desc
 

services/archive/services/ingestion_metadata/ingestion_metadata.py

@@ -31,8 +31,8 @@
 #
 from pyramid.view import view_config
 from pyramid.httpexceptions import exception_response
-from pyat.schema import ExecutionBlock, ScienceProduct
-from pyat.schema.vlassmodel import ProductVersionArchiveid, ProductVersion, Product, Prerequisite
+from schema import ExecutionBlock, ScienceProduct
+from schema.vlassmodel import ProductVersionArchiveid, ProductVersion, Product, Prerequisite
 from sqlalchemy.orm import aliased
 from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
 from services import DB

services/archive/services/locator/locator.py

@@ -7,8 +7,8 @@ The primary user of this information is the archive data fetcher.
 from functools import reduce
 from pathlib import Path
 
-from pyat.schema import ScienceProduct, AncillaryProduct
-from pyat.schema.ngasmodel import NGASFile, NGASDisk
+from schema import ScienceProduct, AncillaryProduct
+from schema.ngasmodel import NGASFile, NGASDisk
 from pyramid.httpexceptions import exception_response
 from pyramid.view import view_config
 from sqlalchemy import func

services/archive/services/mous_details/mous_details.py

@@ -8,7 +8,7 @@ from . import def_name
 from services.solr.query_builder import ArchiveSolrParameters
 from services.client_services import ResponseMsg
 
-from pyat.schema import AlmaSourceDatum, AlmaSpwDatum, t_alma_spw_sources
+from schema import AlmaSourceDatum, AlmaSpwDatum, t_alma_spw_sources
 from services import DB
 
 log = logging.getLogger(__name__)

services/archive/setup.py

@@ -37,16 +37,16 @@ def find_version(*file_paths):
 
 
 requires = [
+    'pycapo',
     'pyramid',
     'pyramid_beaker',
+    'pyramid_debugtoolbar',
     'pyramid_tm',
+    'requests',
+    'schema',
     'sqlalchemy',
     'waitress',
-    'zope.sqlalchemy',
-    'pycapo',
-    'pyat',
-    'requests',
-    'pyramid_debugtoolbar',
+    'zope.sqlalchemy'
 ]
 
 setup(