Clean up root_validators

Remove root_path from FastAPI
Update Season 8 Cardsets
Force pydantic 1.x

.gitignore

@@ -55,5 +55,6 @@ Lib/
 Scripts/
 storage/
 pyenv.cfg
-Dockerfile
 pyvenv.cfg
+docker-compose*
+*.db

Dockerfile

@@ -0,0 +1,39 @@
+FROM tiangolo/uvicorn-gunicorn-fastapi:latest
+
+WORKDIR /usr/src/app
+
+# Chrome dependency Instalation
+RUN apt-get update && apt-get install -y \
+    fonts-liberation \
+    libasound2 \
+    libatk-bridge2.0-0 \
+    libatk1.0-0 \
+    libatspi2.0-0 \
+    libcups2 \
+    libdbus-1-3 \
+    libdrm2 \
+    libgbm1 \
+    libgtk-3-0 \
+#    libgtk-4-1 \
+    libnspr4 \
+    libnss3 \
+    libwayland-client0 \
+    libxcomposite1 \
+    libxdamage1 \
+    libxfixes3 \
+    libxkbcommon0 \
+    libxrandr2 \
+    xdg-utils \
+    libu2f-udev \
+    libvulkan1
+ # Chrome instalation 
+RUN curl -LO  https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+RUN apt-get install -y ./google-chrome-stable_current_amd64.deb
+RUN rm google-chrome-stable_current_amd64.deb
+# Check chrome version
+RUN echo "Chrome: " && google-chrome --version
+
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY ./app /app/app

app/db_engine.py

@@ -37,7 +37,7 @@ CARDSETS = {
     },
     'minor-league': {
         'primary': [20, 8],  # 1998, Mario
-        'secondary': [17],   # 2024
+        'secondary': [6],    # 2008
         'human': [x for x in range(1, 30)]
     },
     'major-league': {

app/main.py

@@ -1,5 +1,3 @@
-import os
-
 from fastapi import FastAPI, Request
 from fastapi.openapi.docs import get_swagger_ui_html
 from fastapi.openapi.utils import get_openapi
@@ -13,7 +11,7 @@ from .routers_v2 import (
     battingcardratings, pitchingcards, pitchingcardratings, cardpositions, scouting, mlbplayers, stratgame, stratplays)
 
 app = FastAPI(
-    root_path='/api',
+    # root_path='/api',
     responses={404: {'description': 'Not found'}},
     docs_url='/api/docs',
     redoc_url='/api/redoc'

app/routers_v2/battingcardratings.py

@@ -75,7 +75,7 @@ class BattingCardRatingsModel(pydantic.BaseModel):
                 values['double_two'] * 2 + values['double_pull'] * 2 + values['single_two'] + values['single_one'] +
                 values['single_center'] + values['bp_single'] / 2) / 108
 
-    @root_validator
+    @root_validator(skip_on_failure=True)
     def validate_chance_total(cls, values):
         total_chances = (
                 values['homerun'] + values['bp_homerun'] + values['triple'] + values['double_three'] +

app/routers_v2/cardpositions.py

@@ -30,7 +30,7 @@ class CardPositionModel(pydantic.BaseModel):
     pb: Optional[int] = None
     overthrow: Optional[int] = None
 
-    @root_validator
+    @root_validator(skip_on_failure=True)
     def position_validator(cls, values):
         if values['position'] in ['C', 'LF', 'CF', 'RF'] and values['arm'] is None:
             raise ValueError(f'{values["position"]} must have an arm rating')

app/routers_v2/pitchingcardratings.py

@@ -76,7 +76,7 @@ class PitchingCardRatingsModel(pydantic.BaseModel):
                 values['double_two'] * 2 + values['double_cf'] * 2 + values['single_two'] + values['single_one'] +
                 values['single_center'] + values['bp_single'] / 2) / 108
 
-    @root_validator
+    @root_validator(skip_on_failure=True)
     def validate_chance_total(cls, values):
         total_chances = (
                 values['homerun'] + values['bp_homerun'] + values['triple'] + values['double_three'] +

app/routers_v2/stratgame.py

@@ -3,7 +3,7 @@ from typing import Literal, Optional, List
 import logging
 import pandas as pd
 import pydantic
-from pydantic import validator, root_validator
+from pydantic import validator
 
 from ..db_engine import db, StratGame, model_to_dict, chunked, PitchingCard, Player, query_to_csv, Team, fn
 from ..dependencies import oauth2_scheme, valid_token, LOG_DATA

requirements.txt

@@ -1,3 +1,4 @@
+pydantic==1.*
 fastapi
 uvicorn
 peewee

venv/share/man/man1/ttx.1

@@ -1,225 +0,0 @@
-.Dd May 18, 2004
-.\" ttx is not specific to any OS, but contrary to what groff_mdoc(7)
-.\" seems to imply, entirely omitting the .Os macro causes 'BSD' to
-.\" be used, so I give a zero-width space as its argument.
-.Os \&
-.\" The "FontTools Manual" argument apparently has no effect in
-.\" groff 1.18.1. I think it is a bug in the -mdoc groff package.
-.Dt TTX 1 "FontTools Manual"
-.Sh NAME
-.Nm ttx
-.Nd tool for manipulating TrueType and OpenType fonts
-.Sh SYNOPSIS
-.Nm
-.Bk
-.Op Ar option ...
-.Ek
-.Bk
-.Ar file ...
-.Ek
-.Sh DESCRIPTION
-.Nm
-is a tool for manipulating TrueType and OpenType fonts.  It can convert
-TrueType and OpenType fonts to and from an
-.Tn XML Ns -based format called
-.Tn TTX .
-.Tn TTX
-files have a
-.Ql .ttx
-extension.
-.Pp
-For each
-.Ar file
-argument it is given,
-.Nm
-detects whether it is a
-.Ql .ttf ,
-.Ql .otf
-or
-.Ql .ttx
-file and acts accordingly: if it is a
-.Ql .ttf
-or
-.Ql .otf
-file, it generates a
-.Ql .ttx
-file; if it is a
-.Ql .ttx
-file, it generates a
-.Ql .ttf
-or
-.Ql .otf
-file.
-.Pp
-By default, every output file is created in the same directory as the
-corresponding input file and with the same name except for the
-extension, which is substituted appropriately.
-.Nm
-never overwrites existing files; if necessary, it appends a suffix to
-the output file name before the extension, as in
-.Pa Arial#1.ttf .
-.Ss "General options"
-.Bl -tag -width ".Fl t Ar table"
-.It Fl h
-Display usage information.
-.It Fl d Ar dir
-Write the output files to directory
-.Ar dir
-instead of writing every output file to the same directory as the
-corresponding input file.
-.It Fl o Ar file
-Write the output to
-.Ar file
-instead of writing it to the same directory as the
-corresponding input file.
-.It Fl v
-Be verbose.  Write more messages to the standard output describing what
-is being done.
-.It Fl a
-Allow virtual glyphs ID's on compile or decompile.
-.El
-.Ss "Dump options"
-The following options control the process of dumping font files
-(TrueType or OpenType) to
-.Tn TTX
-files.
-.Bl -tag -width ".Fl t Ar table"
-.It Fl l
-List table information.  Instead of dumping the font to a
-.Tn TTX
-file, display minimal information about each table.
-.It Fl t Ar table
-Dump table
-.Ar table .
-This option may be given multiple times to dump several tables at
-once.  When not specified, all tables are dumped.
-.It Fl x Ar table
-Exclude table
-.Ar table
-from the list of tables to dump.  This option may be given multiple
-times to exclude several tables from the dump.  The
-.Fl t
-and
-.Fl x
-options are mutually exclusive.
-.It Fl s
-Split tables.  Dump each table to a separate
-.Tn TTX
-file and write (under the name that would have been used for the output
-file if the
-.Fl s
-option had not been given) one small
-.Tn TTX
-file containing references to the individual table dump files.  This
-file can be used as input to
-.Nm
-as long as the referenced files can be found in the same directory.
-.It Fl i
-.\" XXX: I suppose OpenType programs (exist and) are also affected.
-Don't disassemble TrueType instructions.  When this option is specified,
-all TrueType programs (glyph programs, the font program and the
-pre-program) are written to the
-.Tn TTX
-file as hexadecimal data instead of
-assembly.  This saves some time and results in smaller
-.Tn TTX
-files.
-.It Fl y Ar n
-When decompiling a TrueType Collection (TTC) file,
-decompile font number
-.Ar n ,
-starting from 0.
-.El
-.Ss "Compilation options"
-The following options control the process of compiling
-.Tn TTX
-files into font files (TrueType or OpenType):
-.Bl -tag -width ".Fl t Ar table"
-.It Fl m Ar fontfile
-Merge the input
-.Tn TTX
-file
-.Ar file
-with
-.Ar fontfile .
-No more than one
-.Ar file
-argument can be specified when this option is used.
-.It Fl b
-Don't recalculate glyph bounding boxes.  Use the values in the
-.Tn TTX
-file as is.
-.El
-.Sh "THE TTX FILE FORMAT"
-You can find some information about the
-.Tn TTX
-file format in
-.Pa documentation.html .
-In particular, you will find in that file the list of tables understood by
-.Nm
-and the relations between TrueType GlyphIDs and the glyph names used in
-.Tn TTX
-files.
-.Sh EXAMPLES
-In the following examples, all files are read from and written to the
-current directory.  Additionally, the name given for the output file
-assumes in every case that it did not exist before
-.Nm
-was invoked.
-.Pp
-Dump the TrueType font contained in
-.Pa FreeSans.ttf
-to
-.Pa FreeSans.ttx :
-.Pp
-.Dl ttx FreeSans.ttf
-.Pp
-Compile
-.Pa MyFont.ttx
-into a TrueType or OpenType font file:
-.Pp
-.Dl ttx MyFont.ttx
-.Pp
-List the tables in
-.Pa FreeSans.ttf
-along with some information:
-.Pp
-.Dl ttx -l FreeSans.ttf
-.Pp
-Dump the
-.Sq cmap
-table from
-.Pa FreeSans.ttf
-to
-.Pa FreeSans.ttx :
-.Pp
-.Dl ttx -t cmap FreeSans.ttf
-.Sh NOTES
-On MS\-Windows and MacOS,
-.Nm
-is available as a graphical application to which files can be dropped.
-.Sh SEE ALSO
-.Pa documentation.html
-.Pp
-.Xr fontforge 1 ,
-.Xr ftinfo 1 ,
-.Xr gfontview 1 ,
-.Xr xmbdfed 1 ,
-.Xr Font::TTF 3pm
-.Sh AUTHORS
-.Nm
-was written by
-.An -nosplit
-.An "Just van Rossum" Aq just@letterror.com .
-.Pp
-This manual page was written by
-.An "Florent Rougon" Aq f.rougon@free.fr
-for the Debian GNU/Linux system based on the existing FontTools
-documentation.  It may be freely used, modified and distributed without
-restrictions.
-.\" For Emacs:
-.\" Local Variables:
-.\" fill-column: 72
-.\" sentence-end: "[.?!][]\"')}]*\\($\\| $\\|   \\|  \\)[   \n]*"
-.\" sentence-end-double-space: t
-.\" End: