Merge pull request #159 from rice-crc/develop

Merge develop into main

api/blog/institution_options.json

@@ -4,6 +4,151 @@
     "label": "ID",
     "flatlabel": "ID"
   },
+  "institution_authors": {
+    "type": "table",
+    "label": "author",
+    "flatlabel": "author"
+  },
+  "institution_authors__id": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "ID",
+    "flatlabel": "author : ID"
+  },
+  "institution_authors__posts": {
+    "type": "table",
+    "label": "Posts",
+    "flatlabel": "author : Posts"
+  },
+  "institution_authors__posts__id": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "ID",
+    "flatlabel": "author : Posts : ID"
+  },
+  "institution_authors__posts__tags": {
+    "type": "table",
+    "label": "Tags",
+    "flatlabel": "author : Posts : Tags"
+  },
+  "institution_authors__posts__tags__id": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "ID",
+    "flatlabel": "author : Posts : Tags : ID"
+  },
+  "institution_authors__posts__tags__name": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Name",
+    "flatlabel": "author : Posts : Tags : Name"
+  },
+  "institution_authors__posts__tags__slug": {
+    "type": "<class 'rest_framework.fields.SlugField'>",
+    "label": "Slug",
+    "flatlabel": "author : Posts : Tags : Slug"
+  },
+  "institution_authors__posts__tags__intro": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Intro",
+    "flatlabel": "author : Posts : Tags : Intro"
+  },
+  "institution_authors__posts__thumbnail": {
+    "type": "<class 'rest_framework.fields.SerializerMethodField'>",
+    "label": "Thumbnail",
+    "flatlabel": "author : Posts : Thumbnail"
+  },
+  "institution_authors__posts__title": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Title",
+    "flatlabel": "author : Posts : Title"
+  },
+  "institution_authors__posts__language": {
+    "type": "<class 'rest_framework.fields.ChoiceField'>",
+    "label": "Language",
+    "flatlabel": "author : Posts : Language"
+  },
+  "institution_authors__posts__subtitle": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Subtitle",
+    "flatlabel": "author : Posts : Subtitle"
+  },
+  "institution_authors__posts__slug": {
+    "type": "<class 'rest_framework.fields.SlugField'>",
+    "label": "Slug",
+    "flatlabel": "author : Posts : Slug"
+  },
+  "institution_authors__posts__updated_on": {
+    "type": "<class 'rest_framework.fields.DateTimeField'>",
+    "label": "Updated on",
+    "flatlabel": "author : Posts : Updated on"
+  },
+  "institution_authors__posts__content": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Content",
+    "flatlabel": "author : Posts : Content"
+  },
+  "institution_authors__posts__created_on": {
+    "type": "<class 'rest_framework.fields.DateTimeField'>",
+    "label": "Created on",
+    "flatlabel": "author : Posts : Created on"
+  },
+  "institution_authors__posts__status": {
+    "type": "<class 'rest_framework.fields.ChoiceField'>",
+    "label": "Status",
+    "flatlabel": "author : Posts : Status"
+  },
+  "institution_authors__photo": {
+    "type": "<class 'rest_framework.fields.SerializerMethodField'>",
+    "label": "Photo",
+    "flatlabel": "author : Photo"
+  },
+  "institution_authors__institution": {
+    "type": "table",
+    "label": "institution",
+    "flatlabel": "author : institution"
+  },
+  "institution_authors__institution__id": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "ID",
+    "flatlabel": "author : institution : ID"
+  },
+  "institution_authors__institution__name": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Name",
+    "flatlabel": "author : institution : Name"
+  },
+  "institution_authors__institution__description": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Description",
+    "flatlabel": "author : institution : Description"
+  },
+  "institution_authors__institution__slug": {
+    "type": "<class 'rest_framework.fields.SlugField'>",
+    "label": "Slug",
+    "flatlabel": "author : institution : Slug"
+  },
+  "institution_authors__institution__image": {
+    "type": "<class 'rest_framework.fields.ImageField'>",
+    "label": "Image",
+    "flatlabel": "author : institution : Image"
+  },
+  "institution_authors__name": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Name",
+    "flatlabel": "author : Name"
+  },
+  "institution_authors__description": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Description",
+    "flatlabel": "author : Description"
+  },
+  "institution_authors__slug": {
+    "type": "<class 'rest_framework.fields.SlugField'>",
+    "label": "Slug",
+    "flatlabel": "author : Slug"
+  },
+  "institution_authors__role": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Role",
+    "flatlabel": "author : Role"
+  },
   "name": {
     "type": "<class 'rest_framework.fields.CharField'>",
     "label": "Name",

api/document/management/commands/transkribus_sync.py

@@ -58,7 +58,7 @@ def handle(self, *args, **options):
 
 		print(resp,json.dumps(j,indent=2))
 
-		#flag all legacy sources with transkribus ids
+		#2. flag all legacy sources with transkribus ids
 
 		legacysources=VoyageSources.objects.all()
 		transkribus_sources=legacysources.exclude(transkribus_docid=None)

api/past/enslaved_options.json

@@ -129,6 +129,121 @@
     "label": "ID",
     "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : ID"
   },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity": {
+    "type": "table",
+    "label": "identity",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__id": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "ID",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : ID"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__principal_alias": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Principal alias",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Principal alias"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__birth_year": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "Birth year",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Birth year"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__birth_month": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "Birth month",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Birth month"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__birth_day": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "Birth day",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Birth day"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__death_year": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "Death year",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Death year"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__death_month": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "Death month",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Death month"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__death_day": {
+    "type": "<class 'rest_framework.fields.IntegerField'>",
+    "label": "Death day",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Death day"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__father_name": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Father name",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Father name"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__father_occupation": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Father occupation",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Father occupation"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__mother_name": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Mother name",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Mother name"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__probate_date": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Probate date",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Probate date"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__will_value_pounds": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Will value pounds",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Will value pounds"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__will_value_dollars": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Will value dollars",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Will value dollars"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__will_court": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Will court",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Will court"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__notes": {
+    "type": "<class 'rest_framework.fields.CharField'>",
+    "label": "Notes",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Notes"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__is_natural_person": {
+    "type": "<class 'rest_framework.fields.BooleanField'>",
+    "label": "Is natural person",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Is natural person"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__last_updated": {
+    "type": "<class 'rest_framework.fields.DateTimeField'>",
+    "label": "Last updated",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Last updated"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__human_reviewed": {
+    "type": "<class 'rest_framework.fields.BooleanField'>",
+    "label": "Human reviewed",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Human reviewed"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__birth_place": {
+    "type": "<class 'rest_framework.relations.PrimaryKeyRelatedField'>",
+    "label": "Birth place",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Birth place"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__death_place": {
+    "type": "<class 'rest_framework.relations.PrimaryKeyRelatedField'>",
+    "label": "Death place",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Death place"
+  },
+  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity__principal_location": {
+    "type": "<class 'rest_framework.relations.PrimaryKeyRelatedField'>",
+    "label": "Principal location",
+    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : identity : Principal location"
+  },
   "enslaved_relations__relation__relation_enslavers__enslaver_alias__alias": {
     "type": "<class 'rest_framework.fields.CharField'>",
     "label": "Alias",
@@ -149,11 +264,6 @@
     "label": "Human reviewed",
     "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : Human reviewed"
   },
-  "enslaved_relations__relation__relation_enslavers__enslaver_alias__identity": {
-    "type": "<class 'rest_framework.relations.PrimaryKeyRelatedField'>",
-    "label": "Identity",
-    "flatlabel": "enslaved in relation : enslavement relation : enslaver in relation : Enslaver alias : Identity"
-  },
   "enslaved_relations__relation__relation_enslavers__role": {
     "type": "table",
     "label": "enslaver role",

api/past/serializers.py

@@ -126,7 +126,13 @@ class Meta:
 		model=CaptiveStatus
 		fields='__all__'
 
+class EnslavedEnslaverIdentitySerializer(serializers.ModelSerializer):
+	class Meta:
+		model=EnslaverIdentity
+		fields='__all__'
+
 class EnslavedEnslaverAliasSerializer(serializers.ModelSerializer):
+	identity=EnslavedEnslaverIdentitySerializer(many=False)
 	class Meta:
 		model=EnslaverAlias
 		fields='__all__'

api/voyages3/settings.py

@@ -55,16 +55,6 @@
 #the below are defined in localsettings.
 #i couldn't figure out how to make the .pg_pass file work in docker
 #and it seemed that if i did, it might not translate to production deployment seamlessly anyways
-DATABASES = {
-    'default': {
-        'ENGINE':'django.db.backends.mysql',
-        'NAME':'voyages_api',
-        'USER':'voyages',
-        'PASSWORD':'voyages',
-        'HOST':'voyages-mysql',
-        'PORT':'3306'
-    }
-}
 
 #DRF settings
 #via https://www.django-rest-framework.org/api-guide/metadata/#setting-the-metadata-scheme

people-networks/app.py

@@ -44,13 +44,12 @@ def network_maps():
 		voyages
 		enslavement_relations
 	returns nodes and edges with attributes
-	i think we should give back 1 hop to start
+	we're now giving back 1 hop (but passing through some intermediary nodes (see utils.py))
 	'''
 	print("received",request.json)
-
 
 	nodes_dict={}
-	edges=[]
+	edges_list=[]
 	st=time.time()
 
 	for nodeclass in ['enslaved','enslavers','voyages','enslavement_relations']:
@@ -61,45 +60,17 @@ def network_maps():
 			gquery=[{"==":[('node_class',),nodeclass]},{":=":[('id',),node_id_int_list]}]
 			querynodes=search_nodes(G, {"and":gquery})
 			for n in querynodes:
-				nodes_dict[n]=G.nodes[n]
-				predecessors=G.predecessors(n)
-				for p in predecessors:
-					e={'s':p,'t':n,'data':G.edges[p,n]}
-					if e not in edges:
-						edges.append(e)
-					nodes_dict[p]=G.nodes[p]
-					for pp in G.predecessors(p):
-						e={'s':pp,'t':p,'data':G.edges[pp,p]}
-						if e not in edges:
-							edges.append(e)
-						nodes_dict[pp]=G.nodes[pp]
-					for ps in G.successors(p):
-						e={'s':p,'t':ps,'data':G.edges[p,ps]}
-						if e not in edges:
-							edges.append(e)
-						nodes_dict[ps]=G.nodes[ps]
-				successors=G.successors(n)
-				for s in successors:
-					e={'s':n,'t':s,'data':G.edges[n,s]}
-					if e not in edges:
-						edges.append(e)
-					nodes_dict[s]=G.nodes[s]
-					for ss in G.successors(s):
-						e={'s':s,'t':ss,'data':G.edges[s,ss]}
-						if e not in edges:
-							edges.append(e)
-						nodes_dict[ss]=G.nodes[ss]
-					for sp in G.predecessors(s):
-						e={'s':sp,'t':s,'data':G.edges[sp,s]}
-						if e not in edges:
-							edges.append(e)
-						nodes_dict[sp]=G.nodes[sp]
+				print("getting node",n)
+				nodes_dict,edges_list=add_neighbors(G,nodes_dict,n,edges_list)
+# 				nodes_dict,edges=add_predecessors(G,nodes_dict,n,edges)
+# 				nodes_dict,edges=add_successors(G,nodes_dict,n,edges)
+
 	nodes=[nodes_dict[k] for k in nodes_dict]
 
 	print("elapsed time:",time.time()-st)
 	output={
 		"nodes":nodes,
-		"edges":edges
+		"edges":edges_list
 	}
 
 	st=time.time()