From 9712e3eeb5ae1acb3790a4004c3113f32a8c4033 Mon Sep 17 00:00:00 2001
From: Coding with Peter <coding.with.peter@gmail.com>
Date: Wed, 17 May 2023 08:53:54 -0700
Subject: [PATCH] features to flask srv. degrees.py started

---
 104ab42f11_md/media/image1.png | Bin 0 -> 338 bytes
 104ab42f11_md/media/image2.png | Bin 0 -> 2112 bytes
 degrees.py                     | 164 +++++++++++++++++++++++++++++++++
 interactive.py                 |  31 ++++++-
 server.py                      |  14 ++-
 templates/basic.html           |  14 +++
 templates/convert.html         |  17 ++++
 7 files changed, 232 insertions(+), 8 deletions(-)
 create mode 100644 104ab42f11_md/media/image1.png
 create mode 100644 104ab42f11_md/media/image2.png
 create mode 100644 degrees.py
 create mode 100644 templates/basic.html
 create mode 100644 templates/convert.html

diff --git a/104ab42f11_md/media/image1.png b/104ab42f11_md/media/image1.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f3dae6250e53d662755935c70821d954158804a
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^{2(?58;~rMGjRk`jKx9jP7LeL$-D$|SkfJRfr1<R
zx&I`x0{NT;9+AZi419+{nDKc2iWH#Wb59q?5DWk0Km05_84nKsD{DJs>MyxtX5*aw
z@sc8kmm7%OE_7Cz$mn6LRq?4l`0b+q=Kmdb-uM4A|HiiO|Eo2`B^h$}{j7Jrr_!bz
za9Bd3&T!BF0|yi|4zN8nHmIrnJ+Cn|VgjRL(%}i_noW!k-`tOvtTQe&-q19si~G;t
zvmd_7Ycrc`x145KC?OH|HZwh<MD*0pg82{aE|l?nyXwmGwmQzy(qmTOfyK2vzvU7W
z7c;(@)yZ<$%UIf+*<2@R;>`?(-D$lXZ5+HhIVKGrD%-;iMEooceUQ#qN=)6L`69g|
efVEIUg2Clb1M>^D$bCRBGkCiCxvX<aXaWGjMSep7

literal 0
HcmV?d00001

diff --git a/104ab42f11_md/media/image2.png b/104ab42f11_md/media/image2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0140704b1f6c4617146400610b6f639cbdf204f0
GIT binary patch
literal 2112
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

literal 0
HcmV?d00001

diff --git a/degrees.py b/degrees.py
new file mode 100644
index 0000000..956cb4c
--- /dev/null
+++ b/degrees.py
@@ -0,0 +1,164 @@
+from lark import Lark, Transformer, v_args
+
+
+
+
+"""describe college courses, their number of units, any other courses that are prerequisites, as well as various degrees which 
+consist of groups of courses that must be taken. The groups have rules associated with them, such as:
+- take all (the following courses)
+- take n (where n=3 or 5 or something)
+- take at least n units from the following list (so the taken course's unit value must add up to n or greater)
+- and so on."""
+
+
+
+
+grammar = """
+    start: program
+
+    program: course_declaration*
+
+    course_declaration: "course" CNAME INT "prerequisites" (CNAME ","?)* "degree" CNAME "{" degree_rule* "}"
+
+    degree_rule: "take" ("all" | "at" INT "from") ("the" "following") "courses" course_list
+
+    course_list: (CNAME ","?)*
+
+    %import common.CNAME
+    %import common.INT
+    %import common.WS
+    %ignore WS
+"""
+
+class Course:
+    def __init__(self, name, units, prerequisites, degree):
+        self.name = name
+        self.units = units
+        self.prerequisites = prerequisites
+        self.degree = degree
+
+class DegreeRule:
+    def __init__(self, verb, n, course_list):
+        self.verb = verb
+        self.n = n
+        self.course_list = course_list
+
+class Degree:
+    def __init__(self, name, degree_rules):
+        self.name = name
+        self.degree_rules = degree_rules
+
+class Rule:
+    pass
+
+class TakeAll(Rule):
+    def __init__(self, courses):
+        self.courses = courses
+
+class TakeN(Rule):
+    def __init__(self, courses, n):
+        self.courses = courses
+        self.n = n
+
+class TakeNUnits(Rule):
+    def __init__(self, courses, n):
+        self.courses = courses
+        self.n = n
+
+@v_args(inline=True)
+class DSLTransformer(Transformer):
+    def __init__(self):
+        self.courses = {}
+        self.degrees = {}
+
+    def course_declaration(self, name, units, prerequisites, degree):
+        return Course(name, int(units), prerequisites.children, degree)
+
+    def degree(self, name, required_courses):
+        self.degrees[name] = Degree(name, required_courses)
+
+    def take_all(self, courses):
+        return TakeAll(courses)
+
+    def take_n(self, courses, n):
+        return TakeN(courses, n)
+
+    def take_n_units(self, courses, n):
+        return TakeNUnits(courses, n)
+    
+    def degree_rule(self, items):
+        verb = items[0]
+        n = None
+        course_list = items[-1]
+        if len(items) == 4:
+            n = int(items[2])
+        return DegreeRule(verb, n, course_list.children)
+
+    def course_list(self, items):
+        return items[:-1]
+
+    def program(self, items):
+        courses = [item for item in items if isinstance(item, Course)]
+        degrees = [item for item in items if isinstance(item, Degree)]
+        return courses, degrees
+
+
+dsl = DSLTransformer()
+dsl.course('CS101', 3)
+dsl.course('CS102', 3, prerequisites=['CS101'])
+dsl.course('MATH101', 3)
+dsl.degree('CS', [
+    dsl.take_all(['CS101', 'CS102']),
+    dsl.take_n_units(['CS101', 'CS102', 'MATH101'], 9),
+    dsl.take_n(['CS101', 'CS102', 'MATH101'], 2),
+])
+
+print(dsl.courses)
+print(dsl.degrees)
+
+
+
+
+
+parser = Lark(grammar)
+transformer = DSLTransformer()
+
+def parse_dsl(dsl):
+    tree = parser.parse(dsl)
+    return transformer.transform(tree)
+
+dsl = """
+course CS101 3 prerequisites none degree CS {
+    take all the following courses {
+        CS102, CS103
+    }
+    take at least 6 from {
+        MATH101, MATH102, MATH103
+    }
+}
+"""
+
+courses, degrees = parse_dsl(dsl)
+print(courses)
+print(degrees)
+
+
+
+
+
+def compute_degree_progress(student_courses, degree):
+    total_units_completed = 0
+    total_required_units = 0
+    for course in degree['required_courses']:
+        if course['id'] in student_courses:
+            total_units_completed += course['units']
+            if 'additional_rules' in course:
+                for rule in course['additional_rules']:
+                    if rule['type'] == 'at_least_n_units_from_list':
+                        units_from_list = sum([c['units'] for c in degree['courses'] if c['id'] in student_courses and c['id'] in rule['course_list']])
+                        if units_from_list < rule['n']:
+                            break
+            total_required_units += course['units']
+    progress_percent = total_units_completed / total_required_units * 100 if total_required_units > 0 else 0
+    return progress_percent
+
diff --git a/interactive.py b/interactive.py
index e74efd0..5e54a1b 100644
--- a/interactive.py
+++ b/interactive.py
@@ -16,6 +16,15 @@ from canvas_secrets import flask_secretkey
 
 from content import my_site
 
+
+
+
+### SET THIS ENV VAR TO GET RELOADING
+# (win)
+# set FLASK_ENV=development
+# (linux)
+# export FLASK_ENV=development
+
 import socket
 this_host = socket.gethostname()
 
@@ -155,6 +164,15 @@ def flask_thread(q):
         return image_crop(filename,x,y,w,h,newname)
 
 
+    @app.route('/md', methods=['GET', 'POST'])
+    def convert_markdown():
+        if request.method == 'POST':
+            markdown_input = request.form.get('markdown_input', '')
+            html_output = markdown.markdown(markdown_input)
+            return render_template('basic.html', title='md -> html', html_output=html_output)
+        return render_template('convert.html')
+
+
 
     #
     #  SAVING STUFF
@@ -166,10 +184,13 @@ def flask_thread(q):
         path = request.form['path']
         txt = request.form['content']
         
-        o3 = codecs.open(server.writing_path + path, 'r', 'utf-8')
-        orig_text = o3.read()
-        o3.close()
-        
+        try:
+            o3 = codecs.open(server.writing_path + path, 'r', 'utf-8')
+            orig_text = o3.read()
+            o3.close()
+        except Exception as e:
+            orig_text = ''
+            
         bu_filename = server.writing_path + 'older_copies/' + path + '_' + now + '.md'
         o2 = codecs.open( bu_filename, 'w', 'utf-8' )
         o2.write(orig_text)
@@ -321,7 +342,7 @@ def flask_thread(q):
 
 
 
-    socketio.run(app, host= '0.0.0.0')
+    socketio.run(app, host= '0.0.0.0')     # , debug=True
     
     
 
diff --git a/server.py b/server.py
index 5aaaba7..318937f 100644
--- a/server.py
+++ b/server.py
@@ -1,5 +1,6 @@
 import json, codecs, re, markdown, os, pypandoc, striprtf, sqlite3, random, urllib
 import subprocess, html, time
+from markdownify import markdownify as md
 from striprtf.striprtf import rtf_to_text
 from flask import render_template, Response
 from flask import send_from_directory
@@ -145,8 +146,9 @@ def screenoff():
 
 br = "<br />"
 nl = "\n"
-style = """<style> body { line-height: 2.3em; margin: 4em; } 
-</style><link rel="stylesheet" href="/data/gui/public/simplemde.min.css">
+style = """<link rel="stylesheet" href="/data/gui/public/simplemde.min.css">
+<style> body { line-height: 2.3em; margin: 4em; } #editor { line-height: 1em!important; }
+</style>
 <script src="/data/gui/public/simplemde.min.js"></script>"""
 
 
@@ -188,6 +190,7 @@ def homepage():
             a('Pi frame on','/displaypi/on') + br + br + \
             a('Pi frame off','/displaypi/off') + br + br + \
             a('Knowledge Base','/x/writing/index') + br + \
+            a('Markdown -> HTML converter','/md') + br + \
             a('Gav web mirror','/mirror') + br + \
             a('Graph of users','/x/user/1') + "<br />" + \
             a('Courses in a dept','/x/dept/csis') + "<br />" + \
@@ -262,7 +265,12 @@ def writing(fname):
         #output = pypandoc.convert_file('C:/Users/peter/Nextcloud/Documents/writing/' + fname, 'html',
         output = pypandoc.convert_file(writing_path + fname, 'html',
                 extra_args=['--extract-media=%s' % hash ])     #   file:///c:/Users/peter/Nextcloud/Documents/writing
-        return style + output
+        output2 = pypandoc.convert_file(writing_path + fname, 'markdown',
+                extra_args=['--extract-media=%s' % hash+'_md' ])     #   file:///c:/Users/peter/Nextcloud/Documents/writing
+        new_fname = fname[:-5] + '.md'
+        #as_md = md(output)
+        return style + output + in_form(editor(output2),new_fname)
+    
     return style + markdown.markdown( "".join( [ orgline(x) for x in inp.readlines() ] ) )
 
 
diff --git a/templates/basic.html b/templates/basic.html
new file mode 100644
index 0000000..403333f
--- /dev/null
+++ b/templates/basic.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>{{ title }}</title>
+    <style>
+        textarea { width: 75%; height: 45rem;}
+        .title {color:grey;}
+    </style>
+</head>
+<body>
+    <h1>Converted HTML Output</h1>
+    <div>{{ html_output|safe }}</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/convert.html b/templates/convert.html
new file mode 100644
index 0000000..0c421b8
--- /dev/null
+++ b/templates/convert.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Markdown to HTML Converter</title>
+    <style>
+        textarea { width: 75%; height: 45rem;}
+        .title {color:rgb(65, 65, 65);}
+    </style>
+</head>
+<body>
+    <h1 class="title">Markdown to HTML Converter</h1>
+    <form method="POST" action="/md">
+        <textarea name="markdown_input" rows="10" cols="50"></textarea><br>
+        <input type="submit" value="Convert">
+    </form>
+</body>
+</html>
\ No newline at end of file