From e0b0b2f976c61225a178c7715caf2656a1f6741f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 15 Dec 2018 21:32:51 +0100 Subject: moving stuff --- megapixels/app/builder/README.md | 21 ++++ megapixels/app/builder/builder.py | 90 ++++++++++++++++ megapixels/app/builder/parser.py | 172 +++++++++++++++++++++++++++++++ megapixels/app/builder/paths.py | 6 ++ megapixels/app/builder/s3.py | 61 +++++++++++ megapixels/app/server/create.py | 10 +- megapixels/app/settings/app_cfg.py | 15 +-- megapixels/commands/faiss/build_faiss.py | 2 - 8 files changed, 366 insertions(+), 11 deletions(-) create mode 100644 megapixels/app/builder/README.md create mode 100644 megapixels/app/builder/builder.py create mode 100644 megapixels/app/builder/parser.py create mode 100644 megapixels/app/builder/paths.py create mode 100644 megapixels/app/builder/s3.py (limited to 'megapixels') diff --git a/megapixels/app/builder/README.md b/megapixels/app/builder/README.md new file mode 100644 index 00000000..1a6d3a1e --- /dev/null +++ b/megapixels/app/builder/README.md @@ -0,0 +1,21 @@ +Megapixels Static Site Generator +================================ + +The index, blog, and about other pages are built using this static site generator. + +## Metadata + +``` +status: published|draft|private +title: From 1 to 100 Pixels +desc: High resolution insights from low resolution imagery +slug: from-1-to-100-pixels +published: 2018-12-04 +updated: 2018-12-04 +authors: Adam Harvey, Berit Gilma, Matthew Stender +``` + +## S3 Assets + +Static assets: `v1/site/about/assets/picture.jpg` +Dataset assets: `v1/datasets/lfw/assets/picture.jpg` diff --git a/megapixels/app/builder/builder.py b/megapixels/app/builder/builder.py new file mode 100644 index 00000000..620fc710 --- /dev/null +++ b/megapixels/app/builder/builder.py @@ -0,0 +1,90 @@ +#!/usr/bin/python + +from dotenv import load_dotenv +load_dotenv() + +import os +import glob +from jinja2 import Environment, FileSystemLoader, select_autoescape + +import s3 +import parser +from paths import * + +env = Environment( + loader=FileSystemLoader(template_path), + autoescape=select_autoescape([]) +) + +def build_page(fn, research_posts): + metadata, sections = parser.read_metadata(fn) + + if metadata is None: + print("{} has no metadata".format(fn)) + return + + print(metadata['url']) + + dirname = os.path.dirname(fn) + output_path = public_path + metadata['url'] + output_fn = os.path.join(output_path, "index.html") + + skip_h1 = False + + if metadata['url'] == '/': + template = env.get_template("home.html") + elif 'research/' in fn: + skip_h1 = True + template = env.get_template("research.html") + else: + template = env.get_template("page.html") + + if 'datasets/' in fn: + s3_dir = s3_datasets_path + else: + s3_dir = s3_site_path + + s3_path = s3.make_s3_path(s3_dir, metadata['path']) + + if 'index.md' in fn: + s3.sync_directory(dirname, s3_dir, metadata) + + content = parser.parse_markdown(sections, s3_path, skip_h1=skip_h1) + + html = template.render( + metadata=metadata, + content=content, + research_posts=research_posts, + latest_research_post=research_posts[-1], + ) + + os.makedirs(output_path, exist_ok=True) + with open(output_fn, "w") as file: + file.write(html) + + print("______") + +def build_research_index(research_posts): + metadata, sections = parser.read_metadata('../site/content/research/index.md') + template = env.get_template("page.html") + s3_path = s3.make_s3_path(s3_site_path, metadata['path']) + content = parser.parse_markdown(sections, s3_path, skip_h1=False) + content += parser.parse_research_index(research_posts) + html = template.render( + metadata=metadata, + content=content, + research_posts=research_posts, + latest_research_post=research_posts[-1], + ) + output_fn = public_path + '/research/index.html' + with open(output_fn, "w") as file: + file.write(html) + +def build_site(): + research_posts = parser.read_research_post_index() + for fn in glob.iglob(os.path.join(content_path, "**/*.md"), recursive=True): + build_page(fn, research_posts) + build_research_index(research_posts) + +if __name__ == '__main__': + build_site() diff --git a/megapixels/app/builder/parser.py b/megapixels/app/builder/parser.py new file mode 100644 index 00000000..dd3643bf --- /dev/null +++ b/megapixels/app/builder/parser.py @@ -0,0 +1,172 @@ +import os +import re +import glob +import mistune + +import s3 +from paths import * + +renderer = mistune.Renderer(escape=False) +markdown = mistune.Markdown(renderer=renderer) + +def fix_images(lines, s3_path): + real_lines = [] + block = "\n\n".join(lines) + for line in block.split("\n"): + if "![" in line: + line = line.replace('![', '') + alt_text, tail = line.split('](', 1) + url, tail = tail.split(')', 1) + if ':' in alt_text: + tail, alt_text = alt_text.split(':', 1) + img_tag = "{}".format(s3_path + url, alt_text.replace("'", "")) + if len(alt_text): + line = "
{}
{}
".format(img_tag, alt_text) + else: + line = "
{}
".format(img_tag, alt_text) + real_lines.append(line) + return "\n".join(real_lines) + +def format_section(lines, s3_path, type=''): + if len(lines): + lines = fix_images(lines, s3_path) + if type: + return "
{}
".format(type, markdown(lines)) + else: + return "
" + markdown(lines) + "
" + return "" + +def format_metadata(section): + meta = [] + for line in section.split('\n'): + key, value = line[2:].split(': ', 1) + meta.append("
{}
{}
".format(key, value)) + return "
{}
".format(''.join(meta)) + +def parse_markdown(sections, s3_path, skip_h1=False): + groups = [] + current_group = [] + for section in sections: + if skip_h1 and section.startswith('# '): + continue + elif section.startswith('+ '): + groups.append(format_section(current_group, s3_path)) + groups.append(format_metadata(section)) + current_group = [] + elif '![wide:' in section: + groups.append(format_section(current_group, s3_path)) + groups.append(format_section([section], s3_path, type='wide')) + current_group = [] + elif '![' in section: + groups.append(format_section(current_group, s3_path)) + groups.append(format_section([section], s3_path, type='images')) + current_group = [] + else: + current_group.append(section) + groups.append(format_section(current_group, s3_path)) + content = "".join(groups) + return content + +def parse_research_index(research_posts): + content = "
" + for post in research_posts: + s3_path = s3.make_s3_path(s3_site_path, post['path']) + if 'image' in post: + post_image = s3_path + post['image'] + else: + post_image = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' + row = "
Research post

{}

{}

".format( + post['path'], + post_image, + post['title'], + post['tagline']) + content += row + content += '
' + return content + +def read_metadata(fn): + with open(fn, "r") as file: + data = file.read() + data = data.replace("\n ", "\n") + if "\n" in data: + data = data.replace("\r", "") + else: + data = data.replace("\r", "\n") + sections = data.split("\n\n") + return parse_metadata(fn, sections) + +default_metadata = { + 'status': 'published', + 'title': 'Untitled Page', + 'desc': '', + 'slug': '', + 'published': '2018-12-31', + 'updated': '2018-12-31', + 'authors': 'Adam Harvey', + 'sync': 'true', + 'tagline': '', +} + +def parse_metadata_section(metadata, section): + for line in section.split("\n"): + if ': ' not in line: + continue + key, value = line.split(': ', 1) + metadata[key.lower()] = value + +def parse_metadata(fn, sections): + found_meta = False + metadata = {} + valid_sections = [] + for section in sections: + if not found_meta and ': ' in section: + found_meta = True + parse_metadata_section(metadata, section) + continue + if '-----' in section: + continue + if found_meta: + valid_sections.append(section) + + if 'title' not in metadata: + print('warning: {} has no title'.format(fn)) + for key in default_metadata: + if key not in metadata: + metadata[key] = default_metadata[key] + + basedir = os.path.dirname(fn.replace(content_path, '')) + basename = os.path.basename(fn) + if basedir == '/': + metadata['path'] = '/' + metadata['url'] = '/' + elif basename == 'index.md': + metadata['path'] = basedir + '/' + metadata['url'] = metadata['path'] + else: + metadata['path'] = basedir + '/' + metadata['url'] = metadata['path'] + basename.replace('.md', '') + '/' + + if metadata['status'] == 'published|draft|private': + metadata['status'] = 'published' + + metadata['sync'] = metadata['sync'] != 'false' + + metadata['author_html'] = '
'.join(metadata['authors'].split(',')) + return metadata, valid_sections + +def read_research_post_index(): + posts = [] + for fn in sorted(glob.glob('../site/content/research/*/index.md')): + metadata, valid_sections = read_metadata(fn) + if metadata is None or metadata['status'] == 'private' or metadata['status'] == 'draft': + continue + posts.append(metadata) + if not len(posts): + posts.append({ + 'title': 'Placeholder', + 'slug': 'placeholder', + 'date': 'Placeholder', + 'url': '/', + }) + return posts + diff --git a/megapixels/app/builder/paths.py b/megapixels/app/builder/paths.py new file mode 100644 index 00000000..356f2f3d --- /dev/null +++ b/megapixels/app/builder/paths.py @@ -0,0 +1,6 @@ + +s3_site_path = "v1/site" +s3_datasets_path = "v1" # datasets is already in the filename +public_path = "../site/public" +content_path = "../site/content" +template_path = "../site/templates" diff --git a/megapixels/app/builder/s3.py b/megapixels/app/builder/s3.py new file mode 100644 index 00000000..41ecdf61 --- /dev/null +++ b/megapixels/app/builder/s3.py @@ -0,0 +1,61 @@ +import os +import glob +import boto3 +from paths import * + +session = boto3.session.Session() + +s3_client = session.client( + service_name='s3', + aws_access_key_id=os.getenv('S3_KEY'), + aws_secret_access_key=os.getenv('S3_SECRET'), + endpoint_url=os.getenv('S3_ENDPOINT'), + region_name=os.getenv('S3_REGION'), +) + +def sync_directory(base_fn, s3_path, metadata): + fns = {} + for fn in glob.glob(os.path.join(base_fn, 'assets/*')): + fns[os.path.basename(fn)] = True + + if not metadata['sync']: + return + + remote_path = s3_path + metadata['url'] + + directory = s3_client.list_objects(Bucket=os.getenv('S3_BUCKET'), Prefix=remote_path) + prefixes = [] + + if 'Contents' in directory: + for obj in directory['Contents']: + s3_fn = obj['Key'] + fn = os.path.basename(s3_fn) + local_fn = os.path.join(base_fn, 'assets', fn) + if fn in fns: + del fns[fn] + if obj['LastModified'].timestamp() < os.path.getmtime(os.path.join(local_fn)): + print("s3 update {}".format(s3_fn)) + s3_client.upload_file( + local_fn, + os.getenv('S3_BUCKET'), + s3_fn, + ExtraArgs={ 'ACL': 'public-read' }) + else: + print("s3 delete {}".format(s3_fn)) + response = s3_client.delete_object( + Bucket=os.getenv('S3_BUCKET'), + Key=s3_fn, + ) + + for fn in fns: + local_fn = os.path.join(base_fn, 'assets', fn) + s3_fn = os.path.join(remote_path, 'assets', fn) + print("s3 create {}".format(s3_fn)) + s3_client.upload_file( + local_fn, + os.getenv('S3_BUCKET'), + s3_fn, + ExtraArgs={ 'ACL': 'public-read' }) + +def make_s3_path(s3_dir, metadata_path): + return "{}/{}/{}{}".format(os.getenv('S3_ENDPOINT'), os.getenv('S3_BUCKET'), s3_dir, metadata_path) diff --git a/megapixels/app/server/create.py b/megapixels/app/server/create.py index 9efed669..c1f41dc4 100644 --- a/megapixels/app/server/create.py +++ b/megapixels/app/server/create.py @@ -1,4 +1,4 @@ -from flask import Flask, Blueprint, jsonify +from flask import Flask, Blueprint, jsonify, send_from_directory from flask_sqlalchemy import SQLAlchemy from app.models.sql_factory import connection_url, load_sql_datasets @@ -7,7 +7,7 @@ from app.server.api import api db = SQLAlchemy() def create_app(script_info=None): - app = Flask(__name__, static_url_path='') + app = Flask(__name__, static_folder='static', static_url_path='') app.config['SQLALCHEMY_DATABASE_URI'] = connection_url app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False @@ -15,6 +15,7 @@ def create_app(script_info=None): datasets = load_sql_datasets(replace=False, base_model=db.Model) app.register_blueprint(api, url_prefix='/api') + app.add_url_rule('/', 'serve_page', serve_page, methods=['GET']) @app.route('/', methods=['GET']) def index(): @@ -34,3 +35,8 @@ def create_app(script_info=None): return(jsonify(links)) return app + +def serve_page(file_relative_path_to_root): + if file_relative_path_to_root[-1] == '/': + file_relative_path_to_root += 'index.html' + return send_from_directory("static", file_relative_path_to_root) diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py index 0507366f..1d3fbc4c 100644 --- a/megapixels/app/settings/app_cfg.py +++ b/megapixels/app/settings/app_cfg.py @@ -57,6 +57,13 @@ DIR_FAISS_RECIPES = join(DIR_FAISS, 'recipes') # Test images DIR_TEST_IMAGES = join(DIR_APP, 'test', 'images') +# ----------------------------------------------------------------------------- +# .env config for keys +# ----------------------------------------------------------------------------- + +DIR_DOTENV = join(DIR_APP, '.env') +load_dotenv(dotenv_path=DIR_DOTENV) + # ----------------------------------------------------------------------------- # Drawing, GUI settings # ----------------------------------------------------------------------------- @@ -69,6 +76,7 @@ FP_FONT = join(DIR_ASSETS, 'font') # ----------------------------------------------------------------------------- DIR_COMMANDS_CV = 'commands/cv' DIR_COMMANDS_ADMIN = 'commands/admin' +DIR_COMMANDS_BUILDER = 'commands/builder' DIR_COMMANDS_DATASETS = 'commands/datasets' DIR_COMMANDS_FAISS = 'commands/faiss' DIR_COMMANDS_MISC = 'commands/misc' @@ -118,10 +126,3 @@ LOGFILE_FORMAT = "%(log_color)s%(levelname)-8s%(reset)s %(cyan)s%(filename)s:%(l # ----------------------------------------------------------------------------- S3_MEDIA_ROOT = 's3://megapixels/v1/media/' S3_METADATA_ROOT = 's3://megapixels/v1/metadata/' - -# ----------------------------------------------------------------------------- -# .env config for keys -# ----------------------------------------------------------------------------- - -DIR_DOTENV = join(DIR_APP, '.env') -load_dotenv(dotenv_path=DIR_DOTENV) diff --git a/megapixels/commands/faiss/build_faiss.py b/megapixels/commands/faiss/build_faiss.py index 96d3f99e..ec94c924 100644 --- a/megapixels/commands/faiss/build_faiss.py +++ b/megapixels/commands/faiss/build_faiss.py @@ -12,8 +12,6 @@ import numpy as np from app.utils.file_utils import load_recipe, load_csv_safe from app.settings import app_cfg as cfg -engine = create_engine('sqlite:///:memory:') - class DefaultRecipe: def __init__(self): self.dim = 128 -- cgit v1.2.3-70-g09d2 From 50a35da0c14664bd3e1392254afec21ef3880440 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 15 Dec 2018 21:43:04 +0100 Subject: make builder a click script --- megapixels/app/builder/builder.py | 25 ++++++++++--------------- megapixels/app/builder/parser.py | 6 +++--- megapixels/app/builder/paths.py | 6 ------ megapixels/app/builder/s3.py | 21 ++++++++++----------- megapixels/app/settings/app_cfg.py | 13 ++++++++++--- megapixels/cli_builder.py | 36 ++++++++++++++++++++++++++++++++++++ megapixels/commands/builder/build.py | 15 +++++++++++++++ 7 files changed, 84 insertions(+), 38 deletions(-) delete mode 100644 megapixels/app/builder/paths.py create mode 100644 megapixels/cli_builder.py create mode 100644 megapixels/commands/builder/build.py (limited to 'megapixels') diff --git a/megapixels/app/builder/builder.py b/megapixels/app/builder/builder.py index 620fc710..d1f882d6 100644 --- a/megapixels/app/builder/builder.py +++ b/megapixels/app/builder/builder.py @@ -1,18 +1,16 @@ #!/usr/bin/python -from dotenv import load_dotenv -load_dotenv() - import os import glob from jinja2 import Environment, FileSystemLoader, select_autoescape -import s3 -import parser -from paths import * +import app.settings.app_cfg as cfg + +import app.builder.s3 +import app.builder.parser env = Environment( - loader=FileSystemLoader(template_path), + loader=FileSystemLoader(cfg.DIR_SITE_TEMPLATES), autoescape=select_autoescape([]) ) @@ -26,7 +24,7 @@ def build_page(fn, research_posts): print(metadata['url']) dirname = os.path.dirname(fn) - output_path = public_path + metadata['url'] + output_path = cfg.DIR_SITE_PUBLIC + metadata['url'] output_fn = os.path.join(output_path, "index.html") skip_h1 = False @@ -40,9 +38,9 @@ def build_page(fn, research_posts): template = env.get_template("page.html") if 'datasets/' in fn: - s3_dir = s3_datasets_path + s3_dir = cfg.S3_DATASETS_PATH else: - s3_dir = s3_site_path + s3_dir = cfg.S3_SITE_PATH s3_path = s3.make_s3_path(s3_dir, metadata['path']) @@ -67,7 +65,7 @@ def build_page(fn, research_posts): def build_research_index(research_posts): metadata, sections = parser.read_metadata('../site/content/research/index.md') template = env.get_template("page.html") - s3_path = s3.make_s3_path(s3_site_path, metadata['path']) + s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, metadata['path']) content = parser.parse_markdown(sections, s3_path, skip_h1=False) content += parser.parse_research_index(research_posts) html = template.render( @@ -82,9 +80,6 @@ def build_research_index(research_posts): def build_site(): research_posts = parser.read_research_post_index() - for fn in glob.iglob(os.path.join(content_path, "**/*.md"), recursive=True): + for fn in glob.iglob(os.path.join(cfg.DIR_SITE_CONTENT, "**/*.md"), recursive=True): build_page(fn, research_posts) build_research_index(research_posts) - -if __name__ == '__main__': - build_site() diff --git a/megapixels/app/builder/parser.py b/megapixels/app/builder/parser.py index dd3643bf..ea84f658 100644 --- a/megapixels/app/builder/parser.py +++ b/megapixels/app/builder/parser.py @@ -3,8 +3,8 @@ import re import glob import mistune -import s3 -from paths import * +import app.settings.app_cfg +import app.builder.s3 renderer = mistune.Renderer(escape=False) markdown = mistune.Markdown(renderer=renderer) @@ -70,7 +70,7 @@ def parse_markdown(sections, s3_path, skip_h1=False): def parse_research_index(research_posts): content = "
" for post in research_posts: - s3_path = s3.make_s3_path(s3_site_path, post['path']) + s3_path = s3.make_s3_path(app_cfg.S3_SITE_PATH, post['path']) if 'image' in post: post_image = s3_path + post['image'] else: diff --git a/megapixels/app/builder/paths.py b/megapixels/app/builder/paths.py deleted file mode 100644 index 356f2f3d..00000000 --- a/megapixels/app/builder/paths.py +++ /dev/null @@ -1,6 +0,0 @@ - -s3_site_path = "v1/site" -s3_datasets_path = "v1" # datasets is already in the filename -public_path = "../site/public" -content_path = "../site/content" -template_path = "../site/templates" diff --git a/megapixels/app/builder/s3.py b/megapixels/app/builder/s3.py index 41ecdf61..99726a4d 100644 --- a/megapixels/app/builder/s3.py +++ b/megapixels/app/builder/s3.py @@ -1,17 +1,6 @@ import os import glob import boto3 -from paths import * - -session = boto3.session.Session() - -s3_client = session.client( - service_name='s3', - aws_access_key_id=os.getenv('S3_KEY'), - aws_secret_access_key=os.getenv('S3_SECRET'), - endpoint_url=os.getenv('S3_ENDPOINT'), - region_name=os.getenv('S3_REGION'), -) def sync_directory(base_fn, s3_path, metadata): fns = {} @@ -23,6 +12,16 @@ def sync_directory(base_fn, s3_path, metadata): remote_path = s3_path + metadata['url'] + session = boto3.session.Session() + + s3_client = session.client( + service_name='s3', + aws_access_key_id=os.getenv('S3_KEY'), + aws_secret_access_key=os.getenv('S3_SECRET'), + endpoint_url=os.getenv('S3_ENDPOINT'), + region_name=os.getenv('S3_REGION'), + ) + directory = s3_client.list_objects(Bucket=os.getenv('S3_BUCKET'), Prefix=remote_path) prefixes = [] diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py index 1d3fbc4c..9e03357b 100644 --- a/megapixels/app/settings/app_cfg.py +++ b/megapixels/app/settings/app_cfg.py @@ -70,7 +70,6 @@ load_dotenv(dotenv_path=DIR_DOTENV) DIR_ASSETS = join(DIR_APP, 'assets') FP_FONT = join(DIR_ASSETS, 'font') - # ----------------------------------------------------------------------------- # click chair settings # ----------------------------------------------------------------------------- @@ -91,7 +90,6 @@ CKPT_ZERO_PADDING = 9 HASH_TREE_DEPTH = 3 HASH_BRANCH_SIZE = 3 - DLIB_FACEREC_JITTERS = 5 # number of face recognition jitters DLIB_FACEREC_PADDING = 0.25 # default dlib @@ -120,9 +118,18 @@ reset: Clear all formatting (both foreground and background colors). """ LOGFILE_FORMAT = "%(log_color)s%(levelname)-8s%(reset)s %(cyan)s%(filename)s:%(lineno)s:%(bold_cyan)s%(funcName)s() %(reset)s%(message)s" - # ----------------------------------------------------------------------------- # S3 storage # ----------------------------------------------------------------------------- S3_MEDIA_ROOT = 's3://megapixels/v1/media/' S3_METADATA_ROOT = 's3://megapixels/v1/metadata/' + +# ----------------------------------------------------------------------------- +# Builder +# ----------------------------------------------------------------------------- + +S3_SITE_PATH = "v1/site" +S3_DATASETS_PATH = "v1" # datasets is already in the filename +DIR_SITE_PUBLIC = "../site/public" +DIR_SITE_CONTENT = "../site/content" +DIR_SITE_TEMPLATES = "../site/templates" diff --git a/megapixels/cli_builder.py b/megapixels/cli_builder.py new file mode 100644 index 00000000..8bc814f1 --- /dev/null +++ b/megapixels/cli_builder.py @@ -0,0 +1,36 @@ +# -------------------------------------------------------- +# add/edit commands in commands/faiss directory +# -------------------------------------------------------- + +import click + +from app.settings import app_cfg as cfg +from app.utils import logger_utils +from app.models.click_factory import ClickSimple + +# click cli factory +cc = ClickSimple.create(cfg.DIR_COMMANDS_BUILDER) + +# -------------------------------------------------------- +# CLI +# -------------------------------------------------------- +@click.group(cls=cc, chain=False) +@click.option('-v', '--verbose', 'verbosity', count=True, default=4, + show_default=True, + help='Verbosity: -v DEBUG, -vv INFO, -vvv WARN, -vvvv ERROR, -vvvvv CRITICAL') +@click.pass_context +def cli(ctx, **kwargs): + """\033[1m\033[94mMegaPixels: FAISS Data Scripts\033[0m + """ + ctx.opts = {} + # init logger + logger_utils.Logger.create(verbosity=kwargs['verbosity']) + + + +# -------------------------------------------------------- +# Entrypoint +# -------------------------------------------------------- +if __name__ == '__main__': + cli() + diff --git a/megapixels/commands/builder/build.py b/megapixels/commands/builder/build.py new file mode 100644 index 00000000..fc4fb302 --- /dev/null +++ b/megapixels/commands/builder/build.py @@ -0,0 +1,15 @@ +""" +Build the static site +""" + +import click + +from app.builder.builder import build_site + +@click.command() +@click.pass_context +def cli(ctx): + """Build the static site + """ + print('Building the site...') + build_site() -- cgit v1.2.3-70-g09d2 From 716f2f82a69a5e554d3e3edd70bcb1d72bff90aa Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 15 Dec 2018 21:45:45 +0100 Subject: build --- megapixels/app/builder/builder.py | 4 ++-- megapixels/app/builder/parser.py | 8 ++++---- site/public/research/index.html | 20 +++++++++++++++++--- 3 files changed, 23 insertions(+), 9 deletions(-) (limited to 'megapixels') diff --git a/megapixels/app/builder/builder.py b/megapixels/app/builder/builder.py index d1f882d6..cb5d8fe9 100644 --- a/megapixels/app/builder/builder.py +++ b/megapixels/app/builder/builder.py @@ -6,8 +6,8 @@ from jinja2 import Environment, FileSystemLoader, select_autoescape import app.settings.app_cfg as cfg -import app.builder.s3 -import app.builder.parser +import app.builder.s3 as s3 +import app.builder.parser as parser env = Environment( loader=FileSystemLoader(cfg.DIR_SITE_TEMPLATES), diff --git a/megapixels/app/builder/parser.py b/megapixels/app/builder/parser.py index ea84f658..985111ac 100644 --- a/megapixels/app/builder/parser.py +++ b/megapixels/app/builder/parser.py @@ -3,8 +3,8 @@ import re import glob import mistune -import app.settings.app_cfg -import app.builder.s3 +import app.settings.app_cfg as cfg +import app.builder.s3 as s3 renderer = mistune.Renderer(escape=False) markdown = mistune.Markdown(renderer=renderer) @@ -70,7 +70,7 @@ def parse_markdown(sections, s3_path, skip_h1=False): def parse_research_index(research_posts): content = "
" for post in research_posts: - s3_path = s3.make_s3_path(app_cfg.S3_SITE_PATH, post['path']) + s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, post['path']) if 'image' in post: post_image = s3_path + post['image'] else: @@ -134,7 +134,7 @@ def parse_metadata(fn, sections): if key not in metadata: metadata[key] = default_metadata[key] - basedir = os.path.dirname(fn.replace(content_path, '')) + basedir = os.path.dirname(fn.replace(cfg.DIR_SITE_CONTENT, '')) basename = os.path.basename(fn) if basedir == '/': metadata['path'] = '/' diff --git a/site/public/research/index.html b/site/public/research/index.html index 59a5fee9..8b43ac17 100644 --- a/site/public/research/index.html +++ b/site/public/research/index.html @@ -26,9 +26,23 @@
-

Research Blog

-

The darkside of datasets and the future of computer vision

-
Research post

Untitled Page

Research post

From 1 to 100 Pixels

Photographs are for romantics. For the rest of us, it's all about data. And a photo contains a massive amount of information about who you are.

+
+

Research

+
+
+
Posted
+
2018-12-15
+
+
+
By
+
Adam Harvey
+
+ +
+
+ +

The darkside of datasets and the future of computer vision

+