(PPS-710): update 'gdcdatamodel' to 'gen3datamodel'

Author: george42-ctds

.secrets.baseline

@@ -123,7 +123,16 @@
         "filename": "bin/settings.py",
         "hashed_secret": "347cd9c53ff77d41a7b22aa56c7b4efaf54658e3",
         "is_verified": false,
-        "line_number": 46
+        "line_number": 44
+      }
+    ],
+    "bin/setup_psqlgraph.py": [
+      {
+        "type": "Secret Keyword",
+        "filename": "bin/setup_psqlgraph.py",
+        "hashed_secret": "afc848c316af1a89d49826c5ae9d00ed769415f3",
+        "is_verified": false,
+        "line_number": 14
       }
     ],
     "peregrine/blueprints/coremetadata.py": [
@@ -273,5 +282,5 @@
       }
     ]
   },
-  "generated_at": "2023-11-01T14:27:13Z"
+  "generated_at": "2024-08-13T14:46:27Z"
 }

bin/setup_notifications.py

@@ -4,7 +4,7 @@
 """
 
 from sqlalchemy import create_engine
-from gdcdatamodel.models.notifications import Base
+from gen3datamodel.models.notifications import Base
 
 
 def setup(host, user, password, database):

bin/setup_psqlgraph.py

@@ -2,7 +2,7 @@
 from sqlalchemy import create_engine
 import logging
 
-from gdcdatamodel.models import *
+from gen3datamodel.models import *
 from psqlgraph import create_all, Node, Edge
 
 
@@ -11,7 +11,7 @@ def try_drop_test_data(user, password, database, root_user="postgres", host=""):
 
     engine = create_engine(
         "postgres://{user}:{pwd}@{host}/postgres".format(
-            user=root_user, pwd=password, host=host
+            user=root_user, pwd="postgres", host=host
         )
     )
 
@@ -46,7 +46,7 @@ def setup_database(
 
     engine = create_engine(
         "postgres://{user}:{pwd}@{host}/postgres".format(
-            user=root_user, pwd=password, host=host
+            user=root_user, pwd="postgres", host=host
         )
     )
     conn = engine.connect()

bin/setup_transactionlogs.py

@@ -5,7 +5,7 @@
 
 import argparse
 from sqlalchemy import create_engine
-from gdcdatamodel.models.submission import Base
+from gen3datamodel.models.submission import Base
 
 
 def setup(host, user, password, database):

peregrine/api.py

@@ -103,8 +103,8 @@ def dictionary_init(app):
 
         d = gdcdictionary.gdcdictionary
     dictionary.init(d)
-    from gdcdatamodel import models as md
-    from gdcdatamodel import validators as vd
+    from gen3datamodel import models as md
+    from gen3datamodel import validators as vd
 
     datamodelutils.validators.init(vd)
     datamodelutils.models.init(md)

peregrine/models.py

@@ -1,19 +1,19 @@
 """
 This module generalizes the data model used by the peregrine blueprint, and
 must be initialized using another ``models`` module to set the attributes of
-this module. For example, using ``gdcdatamodel.models`` as the models:
+this module. For example, using ``gen3datamodel.models`` as the models:
 
 .. code-block:: python
 
-    peregrine.models.init(gdcdatamodel.models)
+    peregrine.models.init(gen3datamodel.models)
 
 Then this module can be imported elsewhere in ``peregrine``:
 
 .. code-block:: python
 
     from peregrine import models
 
-    # This is effectively an alias of ``gdcdatamodel.models.Project``.
+    # This is effectively an alias of ``gen3datamodel.models.Project``.
     models.Project
 """
 

peregrine/resources/submission/graphql/node.py

@@ -3,7 +3,7 @@
 peregrine.resources.submission.graphql.node
 ----------------------------------
 
-Implements GraphQL queries for each gdcdatamodel.model node type
+Implements GraphQL queries for each gen3datamodel.model node type
 using the Graphene GraphQL library
 """
 
@@ -424,7 +424,7 @@ def resolve_node(self, info, **args):
 
     :returns:
         A list of graphene object classes (e.g. a Case query object
-        (not a gdcdatamodel Case)).
+        (not a gen3datamodel Case)).
 
     """