Merge branch 'flask_from_od2m' into 'main'
Flask from od2m See merge request jgenero/actes-princiers!3main
Jean-Damien Genero
3 years ago
commit
720d01f53a
@ -0,0 +1,21 @@
|
||||
import typing as t
|
||||
|
||||
import werkzeug
|
||||
from flask import render_template
|
||||
|
||||
from .app import app
|
||||
from .cmd import db_cli
|
||||
from .routes import main
|
||||
|
||||
app.register_blueprint(main)
|
||||
app.cli.add_command(db_cli)
|
||||
|
||||
|
||||
@app.errorhandler(404)
|
||||
def page_not_found(e: werkzeug.exceptions.HTTPException) -> t.Tuple[t.Text, int]:
|
||||
return render_template("404.html", title="Page non trouvée"), 404
|
||||
|
||||
|
||||
@app.errorhandler(500)
|
||||
def internal_server_error(e: werkzeug.exceptions.HTTPException) -> t.Tuple[t.Text, int]:
|
||||
return render_template("500.html", title="Erreur interne du serveur"), 500
|
||||
@ -0,0 +1,3 @@
|
||||
from .db import db_cli
|
||||
|
||||
__all__ = ["db_cli"]
|
||||
@ -0,0 +1,223 @@
|
||||
import csv
|
||||
import os
|
||||
import re
|
||||
import typing as t
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from flask.cli import AppGroup
|
||||
from lxml import etree
|
||||
from tqdm import tqdm
|
||||
|
||||
from app.app import APPPATH, db
|
||||
from app.data_actes import diplomatic_type, institution, state
|
||||
from app.modeles import Institution, State, Production_place, Diplo_type, Document, Acte, Individual, Duke, Produced_by
|
||||
|
||||
# from app.data import institution
|
||||
# from app.data import state
|
||||
# from app.data import diplomatic_type
|
||||
|
||||
|
||||
db_cli = AppGroup("db")
|
||||
|
||||
|
||||
def _nonempty(s: str) -> t.Optional[str]:
|
||||
"""Returns content only if non-empty; otherwise returns None"""
|
||||
if s:
|
||||
return s
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
def _capitalize_first(s: t.Optional[str]) -> t.Optional[str]:
|
||||
return (s[0].upper() + s[1:]) if s else None
|
||||
|
||||
|
||||
def make_soup(file):
|
||||
"""open a xml file and return a BeautifulSoup object"""
|
||||
with open(file, 'r', encoding="utf-8") as opening:
|
||||
xml = BeautifulSoup(opening, 'xml')
|
||||
return xml
|
||||
|
||||
|
||||
def _create_institution(data_lst: list)-> None:
|
||||
"""create institution table"""
|
||||
for data in tqdm(data_lst, desc="Populating Institution..."):
|
||||
Institution.create(**data)
|
||||
|
||||
def _create_state(data_lst: list)-> None:
|
||||
"""create state table"""
|
||||
for data in tqdm(data_lst, desc="Populating State..."):
|
||||
State.create(**data)
|
||||
|
||||
def _create_diplo_type(data_lst: list)-> None:
|
||||
"""create diplo type table"""
|
||||
for data in tqdm(data_lst, desc="Populating Diplo_type..."):
|
||||
Diplo_type.create(**data)
|
||||
|
||||
def _create_produc_place(xml_file: str, folder: str)-> None:
|
||||
"""create production place table"""
|
||||
places_xtract = []
|
||||
production_places = []
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
for place in soup.find('placeName', {'type': 'production_place'}):
|
||||
places_xtract.append(place)
|
||||
production_places = [{"placename": xtraction} for xtraction in set(places_xtract)]
|
||||
for data in tqdm(production_places, desc="Populating Place..."):
|
||||
Production_place.create(**data)
|
||||
|
||||
def _create_doc(xml_file: str, folder: str)-> None:
|
||||
"""create doc table"""
|
||||
details_doc = []
|
||||
infos_doc = []
|
||||
# 1/ get repository (doc archives) + doc collection in a list
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
inst_doc = soup.repository.text
|
||||
nb_doc_1 = soup.msIdentifier.find_all("idno", {"n": "1"})[0].text
|
||||
details_doc.append(inst_doc + " == " + nb_doc_1)
|
||||
# 2/ make a query on table Inst to get inst id
|
||||
# then pretiffy data for the table Doc
|
||||
for doc in set(details_doc):
|
||||
doc_archives = re.sub('(.+) == .+', '\\1', doc)
|
||||
doc_cote = re.sub('.+ == (.+)', '\\1', doc)
|
||||
inst_query = [t.id_institution for t in Institution.select().where(
|
||||
Institution.full_label == doc_archives)]
|
||||
infos_doc.append({
|
||||
"inst_doc": inst_query[0],
|
||||
"collection_doc": doc_cote,
|
||||
})
|
||||
# 3/ create the table
|
||||
for data in tqdm(infos_doc, desc="Populating Document..."):
|
||||
Document.create(**data)
|
||||
|
||||
def _create_acte(xml_file: str, folder: str)-> None:
|
||||
actes = []
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
numb = soup.TEI["xml:id"]
|
||||
date_time = soup.msItem.docDate["when"]
|
||||
date = soup.msItem.docDate.text
|
||||
analyse = soup.abstract.p.text
|
||||
ref = soup.msIdentifier.find_all("idno", {"n": "2"})
|
||||
if len(ref) > 0:
|
||||
ref_acte = ref[0].text
|
||||
else:
|
||||
ref_acte = "NS"
|
||||
prod_place = soup.find_all("placeName", {"type": "production_place"})[0].text
|
||||
doc = soup.msIdentifier.find_all("idno", {"n": "1"})[0]
|
||||
type_diplo = soup.body.div["subtype"]
|
||||
diplo_state = soup.body.div["type"]
|
||||
place_query = [t.id_place for t in Production_place.select().where(
|
||||
Production_place.placename == prod_place)]
|
||||
doc_query = [t.id_document for t in Document.select().where(
|
||||
Document.collection_doc == doc.text)]
|
||||
diplo_query = [t.id_diplo_type for t in Diplo_type.select().where(
|
||||
Diplo_type.diplo_label == type_diplo)]
|
||||
state_query = [t.id_state for t in State.select().where(
|
||||
State.state_label == diplo_state)]
|
||||
actes.append({
|
||||
"numb_acte": numb,
|
||||
"date_time": date_time,
|
||||
"date": date,
|
||||
"prod_place_acte": place_query[0],
|
||||
"analysis": analyse,
|
||||
"doc_acte": doc_query[0],
|
||||
"ref_acte": ref_acte,
|
||||
"state_doc": state_query[0],
|
||||
"diplo_type_acte": diplo_query[0]
|
||||
})
|
||||
for data in tqdm(actes, desc="Populating Actes..."):
|
||||
Acte.create(**data)
|
||||
|
||||
|
||||
def __find_indiv(xml_soup, role: str, indiv_lst: list)-> None:
|
||||
princes = xml_soup.sourceDesc.find_all("listPerson", {"type": role})
|
||||
for prince in princes:
|
||||
dukes = prince.find_all("person")
|
||||
for duke in dukes:
|
||||
indiv_lst.append(duke.text.replace("\n", ""))
|
||||
"""
|
||||
def _create_individual(xml_file: str, folder: str)-> None:
|
||||
indiv_prince = []
|
||||
indiv_secret = []
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
__find_indiv(soup, "prince", indiv_prince)
|
||||
__find_indiv(soup, "signatory", indiv_secret)
|
||||
print(set(indiv_secret))
|
||||
print(set(indiv_prince))
|
||||
"""
|
||||
|
||||
def __indiv_infos(indiv_type):
|
||||
with open(os.path.join(APPPATH, "static", "csv", "actors.csv"), 'r', encoding="utf-8") as opening:
|
||||
actors_csv = csv.reader(opening, delimiter=";")
|
||||
next(actors_csv, None)
|
||||
lst_of_indiv = [row for row in actors_csv if row[1] == indiv_type]
|
||||
return lst_of_indiv
|
||||
|
||||
def _create_indiv():
|
||||
actors = [*__indiv_infos("secret"), *__indiv_infos("prince")]
|
||||
individuals = [{"name_indiv": actor[0], "role_indiv": actor[1]}
|
||||
for actor in actors]
|
||||
for data in tqdm(individuals, desc="Populating Individual..."):
|
||||
Individual.create(**data)
|
||||
|
||||
def _create_duke():
|
||||
dukes = []
|
||||
for info in __indiv_infos("prince"):
|
||||
indiv_query = [t.id_indiv for t in Individual.select().where(
|
||||
Individual.name_indiv == info[0])]
|
||||
dukes.append({"house": info[2], "indiv_duke": indiv_query[0],
|
||||
"birth": info[3], "reign": info[4], "death": info[4]})
|
||||
for data in tqdm(dukes, desc="Populating Duke..."):
|
||||
Duke.create(**data)
|
||||
|
||||
def _create_produced_by(xml_file: str, folder: str):
|
||||
princes_actes = []
|
||||
for acte in os.listdir(folder):
|
||||
acte_q = [t.id_acte for t in Acte.select().where(
|
||||
Acte.numb_acte == acte.replace(".xml", ""))]
|
||||
# print(acte, "==", acte_q[0])
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
princes = soup.sourceDesc.find_all("listPerson", {"type": "prince"})
|
||||
for prince in princes:
|
||||
dukes = prince.find_all("person")
|
||||
for duke in dukes:
|
||||
prince = duke.text.replace("\n", "")
|
||||
prince_q = [t.id_indiv for t in Individual.select().where(
|
||||
Individual.name_indiv == duke.text.replace("\n", ""))]
|
||||
duke_q = [t.id_duke for t in Duke.select().where(
|
||||
Duke.indiv_duke == prince_q[0])]
|
||||
# print(prince, "==", prince_q[0], "==", duke_q[0])
|
||||
princes_actes.append({"produced_by_acte": acte_q[0],
|
||||
"produced_by_prince": duke_q[0]})
|
||||
for data in tqdm(princes_actes, desc="Populating Produced_by..."):
|
||||
Produced_by.create(**data)
|
||||
|
||||
|
||||
@db_cli.command()
|
||||
def init() -> None:
|
||||
"""Initialization of the database"""
|
||||
xml = os.path.join(APPPATH, "static", "xml",
|
||||
"Bourbon", "Brb_5_Charles_Ier"), ".xml"
|
||||
xml_folder = os.path.join(APPPATH, "static", "xml",
|
||||
"Bourbon", "Brb_5_Charles_Ier")
|
||||
|
||||
print("Dropping existing DB...")
|
||||
db.drop_tables([Institution, State, Production_place,
|
||||
Diplo_type, Document, Acte, Individual, Duke,
|
||||
Produced_by])
|
||||
print("Re-creating schema...")
|
||||
db.create_tables([Institution, State, Production_place,
|
||||
Diplo_type, Document, Acte, Individual, Duke,
|
||||
Produced_by])
|
||||
_create_institution(institution)
|
||||
_create_state(state)
|
||||
_create_diplo_type(diplomatic_type)
|
||||
_create_produc_place(xml, xml_folder)
|
||||
_create_doc(xml, xml_folder)
|
||||
_create_acte(xml, xml_folder)
|
||||
_create_indiv()
|
||||
_create_duke()
|
||||
_create_produced_by(xml, xml_folder)
|
||||
@ -0,0 +1,5 @@
|
||||
from .diplo_type_data import diplomatic_type
|
||||
from .institution_data import institution
|
||||
from .state_data import state
|
||||
|
||||
__all__ = ["diplomatic_type", "institution", "state"]
|
||||
@ -1,217 +0,0 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
"""
|
||||
Authors : Jean-Damien Généro
|
||||
Affiliation : French National Center for Scientific Research (CNRS)
|
||||
Assigned at the Centre de recherches historiques (CRH, UMR 8558)
|
||||
Date : 2022-10-11
|
||||
Update : 2022-10-13
|
||||
"""
|
||||
|
||||
import csv
|
||||
import os
|
||||
import re
|
||||
from bs4 import BeautifulSoup
|
||||
from peewee import *
|
||||
from tqdm import tqdm
|
||||
|
||||
from modeles.princes_db_tables import db, Institution, State, Production_place, Diplo_type, Document, Acte, Individual, Duke, Produced_by
|
||||
|
||||
from data.institution_data import institution
|
||||
from data.state_data import state
|
||||
from data.diplo_type_data import diplomatic_type
|
||||
|
||||
|
||||
def make_soup(file):
|
||||
"""open a xml file and return a BeautifulSoup object"""
|
||||
with open(file, 'r', encoding="utf-8") as opening:
|
||||
xml = BeautifulSoup(opening, 'xml')
|
||||
return xml
|
||||
|
||||
|
||||
def _create_institution(data_lst: list)-> None:
|
||||
"""create institution table"""
|
||||
for data in tqdm(data_lst, desc="Populating Institution..."):
|
||||
Institution.create(**data)
|
||||
|
||||
def _create_state(data_lst: list)-> None:
|
||||
"""create state table"""
|
||||
for data in tqdm(data_lst, desc="Populating State..."):
|
||||
State.create(**data)
|
||||
|
||||
def _create_diplo_type(data_lst: list)-> None:
|
||||
"""create diplo type table"""
|
||||
for data in tqdm(data_lst, desc="Populating Diplo_type..."):
|
||||
Diplo_type.create(**data)
|
||||
|
||||
def _create_produc_place(xml_file: str, folder: str)-> None:
|
||||
"""create production place table"""
|
||||
places_xtract = []
|
||||
production_places = []
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
for place in soup.find('placeName', {'type': 'production_place'}):
|
||||
places_xtract.append(place)
|
||||
production_places = [{"placename": xtraction} for xtraction in set(places_xtract)]
|
||||
for data in tqdm(production_places, desc="Populating Place..."):
|
||||
Production_place.create(**data)
|
||||
|
||||
def _create_doc(xml_file: str, folder: str)-> None:
|
||||
"""create doc table"""
|
||||
details_doc = []
|
||||
infos_doc = []
|
||||
# 1/ get repository (doc archives) + doc collection in a list
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
inst_doc = soup.repository.text
|
||||
nb_doc_1 = soup.msIdentifier.find_all("idno", {"n": "1"})[0].text
|
||||
details_doc.append(inst_doc + " == " + nb_doc_1)
|
||||
# 2/ make a query on table Inst to get inst id
|
||||
# then pretiffy data for the table Doc
|
||||
for doc in set(details_doc):
|
||||
doc_archives = re.sub('(.+) == .+', '\\1', doc)
|
||||
doc_cote = re.sub('.+ == (.+)', '\\1', doc)
|
||||
inst_query = [t.id_institution for t in Institution.select().where(
|
||||
Institution.full_label == doc_archives)]
|
||||
infos_doc.append({
|
||||
"inst_doc": inst_query[0],
|
||||
"collection_doc": doc_cote,
|
||||
})
|
||||
# 3/ create the table
|
||||
for data in tqdm(infos_doc, desc="Populating Document..."):
|
||||
Document.create(**data)
|
||||
|
||||
def _create_acte(xml_file: str, folder: str)-> None:
|
||||
actes = []
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
numb = soup.TEI["xml:id"]
|
||||
date_time = soup.msItem.docDate["when"]
|
||||
date = soup.msItem.docDate.text
|
||||
analyse = soup.abstract.p.text
|
||||
ref = soup.msIdentifier.find_all("idno", {"n": "2"})
|
||||
if len(ref) > 0:
|
||||
ref_acte = ref[0].text
|
||||
else:
|
||||
ref_acte = "NS"
|
||||
prod_place = soup.find_all("placeName", {"type": "production_place"})[0].text
|
||||
doc = soup.msIdentifier.find_all("idno", {"n": "1"})[0]
|
||||
type_diplo = soup.body.div["subtype"]
|
||||
diplo_state = soup.body.div["type"]
|
||||
place_query = [t.id_place for t in Production_place.select().where(
|
||||
Production_place.placename == prod_place)]
|
||||
doc_query = [t.id_document for t in Document.select().where(
|
||||
Document.collection_doc == doc.text)]
|
||||
diplo_query = [t.id_diplo_type for t in Diplo_type.select().where(
|
||||
Diplo_type.diplo_label == type_diplo)]
|
||||
state_query = [t.id_state for t in State.select().where(
|
||||
State.state_label == diplo_state)]
|
||||
actes.append({
|
||||
"numb_acte": numb,
|
||||
"date_time": date_time,
|
||||
"date": date,
|
||||
"prod_place_acte": place_query[0],
|
||||
"analysis": analyse,
|
||||
"doc_acte": doc_query[0],
|
||||
"ref_acte": ref_acte,
|
||||
"state_doc": state_query[0],
|
||||
"diplo_type_acte": diplo_query[0]
|
||||
})
|
||||
for data in tqdm(actes, desc="Populating Actes..."):
|
||||
Acte.create(**data)
|
||||
|
||||
|
||||
def __find_indiv(xml_soup, role: str, indiv_lst: list)-> None:
|
||||
princes = xml_soup.sourceDesc.find_all("listPerson", {"type": role})
|
||||
for prince in princes:
|
||||
dukes = prince.find_all("person")
|
||||
for duke in dukes:
|
||||
indiv_lst.append(duke.text.replace("\n", ""))
|
||||
"""
|
||||
def _create_individual(xml_file: str, folder: str)-> None:
|
||||
indiv_prince = []
|
||||
indiv_secret = []
|
||||
for acte in os.listdir(folder):
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
__find_indiv(soup, "prince", indiv_prince)
|
||||
__find_indiv(soup, "signatory", indiv_secret)
|
||||
print(set(indiv_secret))
|
||||
print(set(indiv_prince))
|
||||
"""
|
||||
|
||||
def __indiv_infos(indiv_type):
|
||||
with open("./static/csv/actors.csv", 'r', encoding="utf-8") as opening:
|
||||
actors_csv = csv.reader(opening, delimiter=";")
|
||||
next(actors_csv, None)
|
||||
lst_of_indiv = [row for row in actors_csv if row[1] == indiv_type]
|
||||
return lst_of_indiv
|
||||
|
||||
def _create_indiv():
|
||||
actors = [*__indiv_infos("secret"), *__indiv_infos("prince")]
|
||||
individuals = [{"name_indiv": actor[0], "role_indiv": actor[1]}
|
||||
for actor in actors]
|
||||
for data in tqdm(individuals, desc="Populating Individual..."):
|
||||
Individual.create(**data)
|
||||
|
||||
def _create_duke():
|
||||
dukes = []
|
||||
for info in __indiv_infos("prince"):
|
||||
indiv_query = [t.id_indiv for t in Individual.select().where(
|
||||
Individual.name_indiv == info[0])]
|
||||
dukes.append({"house": info[2], "indiv_duke": indiv_query[0],
|
||||
"birth": info[3], "reign": info[4], "death": info[4]})
|
||||
for data in tqdm(dukes, desc="Populating Duke..."):
|
||||
Duke.create(**data)
|
||||
|
||||
def _create_produced_by(xml_file: str, folder: str):
|
||||
princes_actes = []
|
||||
for acte in os.listdir(folder):
|
||||
acte_q = [t.id_acte for t in Acte.select().where(
|
||||
Acte.numb_acte == acte.replace(".xml", ""))]
|
||||
# print(acte, "==", acte_q[0])
|
||||
soup = make_soup(os.path.join(folder, acte))
|
||||
princes = soup.sourceDesc.find_all("listPerson", {"type": "prince"})
|
||||
for prince in princes:
|
||||
dukes = prince.find_all("person")
|
||||
for duke in dukes:
|
||||
prince = duke.text.replace("\n", "")
|
||||
prince_q = [t.id_indiv for t in Individual.select().where(
|
||||
Individual.name_indiv == duke.text.replace("\n", ""))]
|
||||
duke_q = [t.id_duke for t in Duke.select().where(
|
||||
Duke.indiv_duke == prince_q[0])]
|
||||
# print(prince, "==", prince_q[0], "==", duke_q[0])
|
||||
princes_actes.append({"produced_by_acte": acte_q[0],
|
||||
"produced_by_prince": duke_q[0]})
|
||||
for data in tqdm(princes_actes, desc="Populating Produced_by..."):
|
||||
Produced_by.create(**data)
|
||||
|
||||
|
||||
|
||||
def init():
|
||||
"""initializing db"""
|
||||
db.connect()
|
||||
print("Dropping existing DB...")
|
||||
db.drop_tables([Institution, State, Production_place,
|
||||
Diplo_type, Document, Acte, Individual, Duke,
|
||||
Produced_by])
|
||||
print("Re-creating schema...")
|
||||
db.create_tables([Institution, State, Production_place,
|
||||
Diplo_type, Document, Acte, Individual, Duke,
|
||||
Produced_by])
|
||||
_create_institution(institution)
|
||||
_create_state(state)
|
||||
_create_diplo_type(diplomatic_type)
|
||||
_create_produc_place(xml, xml_folder)
|
||||
_create_doc(xml, xml_folder)
|
||||
_create_acte(xml, xml_folder)
|
||||
_create_indiv()
|
||||
_create_duke()
|
||||
_create_produced_by(xml, xml_folder)
|
||||
|
||||
xml = "../bourbon-latex/charles-actes-latex.xml"
|
||||
xml_folder = "./static/xml/Bourbon/Brb_5_Charles_Ier"
|
||||
|
||||
init()
|
||||
# _create_individual(xml, xml_folder)
|
||||
# _create_produced_by(xml, xml_folder)
|
||||
@ -0,0 +1,3 @@
|
||||
from .data import Institution, State, Production_place, Diplo_type, Document, Acte, Individual, Duke, Produced_by
|
||||
|
||||
__all__ = ["Institution", "State", "Production_place", "Diplo_type", "Document", "Acte", "Individual", "Duke", "Produced_by"]
|
||||
@ -0,0 +1,126 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
"""
|
||||
Authors : Jean-Damien Généro
|
||||
Affiliation : French National Center for Scientific Research (CNRS)
|
||||
Assigned at the Centre de recherches historiques (CRH, UMR 8558)
|
||||
Date : 2022-10-11
|
||||
Update :
|
||||
"""
|
||||
|
||||
|
||||
import re
|
||||
import typing as t
|
||||
|
||||
import peewee
|
||||
from flask import url_for
|
||||
from playhouse.sqlite_ext import FTS5Model, RowIDField, SearchField
|
||||
|
||||
from app.app import db
|
||||
|
||||
|
||||
class BaseModel(peewee.Model):
|
||||
class Meta:
|
||||
database = db
|
||||
|
||||
|
||||
# db = SqliteDatabase('actes_princiers.db')
|
||||
# from app.app import db
|
||||
|
||||
class Institution(BaseModel):
|
||||
id_institution = peewee.AutoField()
|
||||
full_label = peewee.TextField()
|
||||
inst_label = peewee.TextField()
|
||||
art_inst = peewee.TextField()
|
||||
inst_place = peewee.TextField()
|
||||
inst_rank = peewee.TextField()
|
||||
inst_type = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Institution'
|
||||
|
||||
|
||||
class State(BaseModel):
|
||||
id_state = peewee.AutoField()
|
||||
state_label = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'State'
|
||||
|
||||
|
||||
class Production_place(BaseModel):
|
||||
id_place = peewee.AutoField()
|
||||
placename = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Production_place'
|
||||
|
||||
|
||||
class Diplo_type(BaseModel):
|
||||
id_diplo_type = peewee.AutoField()
|
||||
diplo_label = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Diplo_type'
|
||||
|
||||
|
||||
class Document(BaseModel):
|
||||
id_document = peewee.AutoField()
|
||||
inst_doc = peewee.ForeignKeyField(Institution, backref='documents')
|
||||
collection_doc = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Document'
|
||||
|
||||
|
||||
class Acte(BaseModel):
|
||||
id_acte = peewee.AutoField()
|
||||
numb_acte = peewee.TextField()
|
||||
date_time = peewee.TextField() # YYYY-MM-DD
|
||||
date = peewee.TextField() # verbose
|
||||
prod_place_acte = peewee.ForeignKeyField(Production_place, backref='actes')
|
||||
analysis = peewee.TextField()
|
||||
doc_acte = peewee.ForeignKeyField(Document, backref='actes')
|
||||
ref_acte = peewee.TextField() # cote
|
||||
state_doc = peewee.ForeignKeyField(State, backref='actes')
|
||||
diplo_type_acte = peewee.ForeignKeyField(Diplo_type, backref='actes')
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Acte'
|
||||
|
||||
class Individual(BaseModel):
|
||||
id_indiv = peewee.AutoField()
|
||||
name_indiv = peewee.TextField()
|
||||
role_indiv = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Individual'
|
||||
|
||||
class Duke(BaseModel):
|
||||
id_duke = peewee.AutoField()
|
||||
house = peewee.TextField()
|
||||
indiv_duke = peewee.ForeignKeyField(Individual, backref='dukes')
|
||||
birth = peewee.TextField()
|
||||
reign = peewee.TextField()
|
||||
death = peewee.TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Duke'
|
||||
|
||||
class Produced_by(BaseModel):
|
||||
id_produced_by = peewee.AutoField()
|
||||
produced_by_acte = peewee.ForeignKeyField(Acte, backref='produced_bys')
|
||||
produced_by_prince = peewee.ForeignKeyField(Duke, backref='produced_bys')
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Produced_by'
|
||||
@ -1,114 +0,0 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
"""
|
||||
Authors : Jean-Damien Généro
|
||||
Affiliation : French National Center for Scientific Research (CNRS)
|
||||
Assigned at the Centre de recherches historiques (CRH, UMR 8558)
|
||||
Date : 2022-10-11
|
||||
Update :
|
||||
"""
|
||||
|
||||
|
||||
from peewee import *
|
||||
|
||||
|
||||
db = SqliteDatabase('actes_princiers.db')
|
||||
# from app.app import db
|
||||
|
||||
class Institution(Model):
|
||||
id_institution = IntegerField(primary_key=True)
|
||||
full_label = TextField()
|
||||
inst_label = TextField()
|
||||
art_inst = TextField()
|
||||
inst_place = TextField()
|
||||
inst_rank = TextField()
|
||||
inst_type = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Institution'
|
||||
|
||||
|
||||
class State(Model):
|
||||
id_state = IntegerField(primary_key=True)
|
||||
state_label = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'State'
|
||||
|
||||
|
||||
class Production_place(Model):
|
||||
id_place = IntegerField(primary_key=True)
|
||||
placename = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Production_place'
|
||||
|
||||
|
||||
class Diplo_type(Model):
|
||||
id_diplo_type = IntegerField(primary_key=True)
|
||||
diplo_label = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Diplo_type'
|
||||
|
||||
|
||||
class Document(Model):
|
||||
id_document = IntegerField(primary_key=True)
|
||||
inst_doc = ForeignKeyField(Institution, backref='documents')
|
||||
collection_doc = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Document'
|
||||
|
||||
|
||||
class Acte(Model):
|
||||
id_acte = IntegerField(primary_key=True)
|
||||
numb_acte = TextField()
|
||||
date_time = TextField() # YYYY-MM-DD
|
||||
date = TextField() # verbose
|
||||
prod_place_acte = ForeignKeyField(Production_place, backref='actes')
|
||||
analysis = TextField()
|
||||
doc_acte = ForeignKeyField(Document, backref='actes')
|
||||
ref_acte = TextField() # cote
|
||||
state_doc = ForeignKeyField(State, backref='actes')
|
||||
diplo_type_acte = ForeignKeyField(Diplo_type, backref='actes')
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Acte'
|
||||
|
||||
class Individual(Model):
|
||||
id_indiv = IntegerField(primary_key=True)
|
||||
name_indiv = TextField()
|
||||
role_indiv = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Individual'
|
||||
|
||||
class Duke(Model):
|
||||
id_duke = IntegerField(primary_key=True)
|
||||
house = TextField()
|
||||
indiv_duke = ForeignKeyField(Individual, backref='dukes')
|
||||
birth = TextField()
|
||||
reign = TextField()
|
||||
death = TextField()
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Duke'
|
||||
|
||||
class Produced_by(Model):
|
||||
id_produced_by = IntegerField(primary_key=True)
|
||||
produced_by_acte = ForeignKeyField(Acte, backref='produced_bys')
|
||||
produced_by_prince = ForeignKeyField(Duke, backref='produced_bys')
|
||||
|
||||
class Meta:
|
||||
database = db
|
||||
db_table = 'Produced_by'
|
||||
@ -1,42 +1,58 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: UTF-8 -*-
|
||||
import os
|
||||
import re
|
||||
import typing as t
|
||||
|
||||
import peewee
|
||||
from flask import Blueprint, abort, render_template, request, send_from_directory
|
||||
from playhouse.flask_utils import PaginatedQuery
|
||||
|
||||
"""
|
||||
author : Jean-Damien Généro
|
||||
date : 2022-10-01
|
||||
update :
|
||||
"""
|
||||
from .app import APPPATH
|
||||
from .modeles import Institution, State, Production_place, Diplo_type, Document, Acte, Individual, Duke, Produced_by
|
||||
|
||||
RESULT_PAR_PAGES = 5
|
||||
|
||||
# import des librairie
|
||||
from flask import Flask, render_template, request
|
||||
from .app import app
|
||||
main = Blueprint("main", __name__, url_prefix="/")
|
||||
|
||||
|
||||
@app.route("/")
|
||||
@main.route("/")
|
||||
def home():
|
||||
"""home route"""
|
||||
return render_template("home.html")
|
||||
"""home route"""
|
||||
return render_template("home.html")
|
||||
|
||||
@app.route("/about/")
|
||||
@main.route("/about/")
|
||||
def about():
|
||||
"""home route"""
|
||||
return render_template("about.html")
|
||||
|
||||
@app.route("/actes/")
|
||||
@main.route("/actes/")
|
||||
def corpora_all():
|
||||
"""copora all route"""
|
||||
return render_template("corpora_all.html")
|
||||
|
||||
@app.route("/actes/<house>") # dont put a slash at the end
|
||||
@main.route("/actes/<house>") # dont put a slash at the end
|
||||
def actes(house):
|
||||
"""actes route"""
|
||||
return render_template("corpus.html", house=house)
|
||||
|
||||
@app.route("/actes/<house>/<prince>") # dont put a slash at the end
|
||||
@main.route("/actes/<house>/<prince>") # dont put a slash at the end
|
||||
def prince_corpus(house=None, prince=None):
|
||||
"""copora prince route"""
|
||||
return render_template("prince_corpus.html", house=house, prince=prince)
|
||||
|
||||
|
||||
@main.route("/contact")
|
||||
def contact() -> t.Text:
|
||||
"""Displays the Contact page"""
|
||||
return render_template("contact.html", title="Contact")
|
||||
|
||||
|
||||
@main.route("/termsofservice")
|
||||
def terms() -> t.Text:
|
||||
"""Displaysthe T&C page."""
|
||||
return render_template("terms.html", title="Mentions légales")
|
||||
|
||||
|
||||
@main.route("/privacy")
|
||||
def privacy() -> t.Text:
|
||||
"""Displays the privacy policy page."""
|
||||
return render_template("privacy.html", title="Politique de confidentialité")
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -0,0 +1,6 @@
|
||||
{% extends "container.html" %}
|
||||
{% block corps %}
|
||||
|
||||
<p class="lead">Impossible de trouver cette page.</p>
|
||||
|
||||
{% endblock %}
|
||||
@ -0,0 +1,6 @@
|
||||
{% extends "container.html" %}
|
||||
{% block corps %}
|
||||
|
||||
<p class="lead">Une erreur interne s'est produite.</p>
|
||||
|
||||
{% endblock %}
|
||||
@ -0,0 +1,10 @@
|
||||
{% extends "container.html" %}
|
||||
{% block corps %}
|
||||
|
||||
<p class="lead">Le travail sur le site et le corpus est toujours en cours. Pour toute remarque, suggestion ou demande d'informations complémentaires, vous pouvez contacter l'équipe scientifique et technique à cette adresse :</p>
|
||||
|
||||
<p class="lead" style='text-align: center; font-weight: bold;'>gestion.sourcesetdonnees [at] ehess.fr</p>
|
||||
|
||||
<p style="font-style: italic;">En contactant l'équipe du site Ouvriers des deux mondes, vous consentez au traitement des données que vous transmeterez dans votre mail. La Règlementation générale sur la protection des données (RGPD) vous permet d'exercer vos droits d'accès, de rectification, de modification ou de suppression de vos données personnelles par simple demande à dpo [at] ehess [.] fr. Pour plus d'information, <a href="{{ url_for('main.terms') }}" title="Mentions légales de ce site">consultez les mentions légales</a>.</p>
|
||||
|
||||
{% endblock %}
|
||||
@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
source .venv/bin/activate
|
||||
export FLASK_ENV=development
|
||||
export FLASK_APP=index.py
|
||||
@ -0,0 +1,45 @@
|
||||
<IfModule mod_ssl.c>
|
||||
<VirtualHost _default_:443>
|
||||
ServerName ouvriersdeuxmondes.huma-num.fr
|
||||
ServerAdmin jean-damien.genero@ehess.fr
|
||||
|
||||
# Document root doesn't really matter as it will be overriden
|
||||
DocumentRoot /var/www/html
|
||||
|
||||
# WSGI configuration
|
||||
# - name the process od2m
|
||||
# - run it as dedicated www-od2m user
|
||||
WSGIDaemonProcess od2m user=www-od2m group=www-od2m threads=5 python-home=/var/www/od2m/.venv/ locale=en_US.UTF-8 socket-timeout=600
|
||||
WSGIScriptAlias / /var/www/od2m/wsgi.py
|
||||
<Directory /var/www/od2m>
|
||||
WSGIProcessGroup od2m
|
||||
WSGIApplicationGroup %{GLOBAL}
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
</Directory>
|
||||
|
||||
# Log files configuration
|
||||
ErrorLog ${APACHE_LOG_DIR}/od2m-error.log
|
||||
CustomLog ${APACHE_LOG_DIR}/od2m-access.log combined
|
||||
|
||||
# SSL configuration
|
||||
SSLEngine on
|
||||
SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
|
||||
<FilesMatch "\.(cgi|shtml|phtml|php)$">
|
||||
SSLOptions +StdEnvVars
|
||||
</FilesMatch>
|
||||
<Directory /usr/lib/cgi-bin>
|
||||
SSLOptions +StdEnvVars
|
||||
</Directory>
|
||||
|
||||
Include /etc/letsencrypt/options-ssl-apache.conf
|
||||
SSLCertificateFile /etc/letsencrypt/live/ouvriersdeuxmondes.huma-num.fr/fullchain.pem
|
||||
SSLCertificateKeyFile /etc/letsencrypt/live/ouvriersdeuxmondes.huma-num.fr/privkey.pem
|
||||
</VirtualHost>
|
||||
|
||||
<VirtualHost *:80>
|
||||
# Make the HTTP virtual host redirect to HTTPS
|
||||
ServerName ouvriersdeuxmondes.huma-num.fr
|
||||
Redirect / https://ouvriersdeuxmondes.huma-num.fr
|
||||
</VirtualHost>
|
||||
</IfModule>
|
||||
@ -0,0 +1,2 @@
|
||||
LoadModule wsgi_module "/var/www/od2m/.venv/lib/python3.8/site-packages/mod_wsgi/server/mod_wsgi-py38.cpython-38-x86_64-linux-gnu.so"
|
||||
WSGIPythonHome "/var/www/od2m/.venv"
|
||||
@ -0,0 +1,14 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
|
||||
"""
|
||||
author = Jean-Damien Généro
|
||||
date = 2020-12-15
|
||||
"""
|
||||
|
||||
|
||||
from app import app
|
||||
|
||||
if __name__ == "__main__":
|
||||
app.run(debug=True)
|
||||
@ -0,0 +1,4 @@
|
||||
[mypy]
|
||||
ignore_missing_imports=True
|
||||
follow_imports=silent
|
||||
show_column_numbers=True
|
||||
@ -0,0 +1,17 @@
|
||||
[flake8]
|
||||
# E501: line too long -> managed by black, allow some lines (docstring, etc.) to be longer
|
||||
# W503: Line break occurred before a binary operator -> preferred way for black
|
||||
# E203: Whitespace before ':' -> managed by black, allow some cases (subscripting, etc.)
|
||||
ignore = E501, W503, E203
|
||||
max-line-length = 110
|
||||
|
||||
[isort]
|
||||
multi_line_output = 3
|
||||
include_trailing_comma = True
|
||||
force_grid_wrap = 0
|
||||
use_parentheses = True
|
||||
ensure_newline_before_comments = True
|
||||
line_length = 110
|
||||
|
||||
[pytest]
|
||||
norecursedirs = .venv .eggs
|
||||
@ -0,0 +1,18 @@
|
||||
import os
|
||||
import sys
|
||||
import typing as t
|
||||
|
||||
sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
|
||||
activate_this = os.path.abspath(os.path.dirname(__file__)) + "/.venv/bin/activate_this.py"
|
||||
|
||||
if os.path.exists(activate_this):
|
||||
with open(activate_this) as file_:
|
||||
exec(file_.read(), dict(__file__=activate_this))
|
||||
|
||||
# On importe l'app uniquement APRES avoir activé le virtualenv
|
||||
from app import app
|
||||
|
||||
app.config["FLASK_ENV"] = "production"
|
||||
|
||||
def application(req_environ: dict, start_response: t.Callable) -> t.Any:
|
||||
return app(req_environ, start_response)
|
||||
Loading…
Reference in New Issue