Correct license to match Dawsonia

.gitignore

@@ -11,5 +11,3 @@ wheels/
 dawsonia.log
 output/*/
 .gradio_cache
-data/
-dawsonia.log.*

Dockerfile

@@ -26,7 +26,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     curl \
     git \      
     ffmpeg \
-    poppler-utils \
     libsm6 \
     libxext6 \
     libgl1 \
@@ -55,9 +54,9 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 SHELL ["/bin/bash", "-c"] 
 
 # Copy dependency files and install dependencies
-COPY --chown=appuser pyproject.toml dawsonia.toml uv.lock LICENSE.txt LICENSE-RA.txt README.md ./ 
+COPY --chown=appuser pyproject.toml dawsonia.toml uv.lock LICENSE README.md ./ 
 
-RUN /home/appuser/.local/bin/uv sync -p 3.10 --frozen --no-cache --no-dev \
+RUN /home/appuser/.local/bin/uv sync -p 3.10 --frozen --no-cache \
     && chown -R appuser:appuser /home/appuser/app/.venv \
     && rm -rf /home/appuser/.cache
 
@@ -70,4 +69,4 @@ COPY --chown=appuser data data
 
 
 # Command to run the application
-CMD ["/home/appuser/.local/bin/uv", "run", "--no-dev", "app/main.py"]
+CMD ["/home/appuser/.local/bin/uv", "run", "app/main.py"]

LICENSE.txt

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    Dawsonia
-    Copyright (C) 2023  AiForObs
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

app/content/sidebar.md

@@ -5,11 +5,8 @@ handwritten observations in weather journals
 
 ### How It Works
 
-1. **Upload** tab: Either,
-    **1a.** select from the **examples** on the right side bar, or
-    **1b.** submit your own PDF / Zarr.zip file and **upload**.
-2. **Digitize**: click on the blue button to digitize the data previewed above.
-3. **Results** tab: View the digitized text generated by the system.
+1. **Upload:** Select from examples on the right or submit your own image file (WIP!) to run through Dawsonia.
+2. **Results:** View the digitized text generated by the system.
 <!-- 3. **Export:** Choose your preferred format and download your results. -->
 
 > Note: This demo application is for demonstration purposes only and is not intended for production use.

app/main.py

@@ -11,7 +11,6 @@ from app.gradio_config import css, theme
 # from app.tabs.export import export
 from app.tabs.submit import collection_submit_state, submit
 
-from app.tabs.submit_functions import GRADIO_CACHE
 from app.tabs.visualizer import collection as collection_viz_state
 from app.tabs.visualizer import visualizer
 
@@ -95,5 +94,5 @@ if __name__ == "__main__":
         server_port=7860,
         enable_monitoring=True,
         show_api=False,
-        allowed_paths=["output", os.path.join(GRADIO_CACHE, "data/output")],
+        allowed_paths=["output"],
     )

app/tabs/submit.py

@@ -1,17 +1,192 @@
+import json
 import logging
+import os
 from pathlib import Path
+import time
+import warnings
 
+from PIL import Image
+from dawsonia import io
+from dawsonia import digitize
+from dawsonia.ml import ml
 import gradio as gr
 from gradio_modal import Modal
+import numpy as np
+from numpy.typing import NDArray
+import pandas as pd
+import pooch
+import yaml
 
-from .submit_functions import all_example_images, get_selected_example_image, move_uploaded_file, get_uploaded_image, run_dawsonia, overwrite_table_format_file
+from .visualizer import Page, TableCell
 
 logger = logging.getLogger(__name__)
 
+# Max number of images a user can upload at once
+MAX_IMAGES = int(os.environ.get("MAX_IMAGES", 5))
+
+# Setup the cache directory to point to the directory where the example images
+# are located. The images must lay in the cache directory because otherwise they
+# have to be reuploaded when drag-and-dropped to the input image widget.
+GRADIO_CACHE = os.getenv("GRADIO_CACHE_DIR", ".gradio_cache")
+DATA_CACHE = os.path.join(GRADIO_CACHE, "data")
+EXAMPLES_DIRECTORY = os.path.join(os.getcwd(), "examples")
+
+# Example books
+PIPELINES: dict[str, dict[str, str]] = {
+    "bjuröklubb": dict(
+        url="https://git.smhi.se/ai-for-obs/data/-/raw/688c04f13e8e946962792fe4b4e0ded98800b154/raw_zarr/BJUR%C3%96KLUBB/DAGBOK_Bjur%C3%B6klubb_Station_Jan-Dec_1928.zarr.zip",
+        known_hash="sha256:6d87b7f79836ae6373cfab11260fe28787d93fe16199fefede6697ccd750f71a",
+    ),
+    "härnösand": dict(
+        url="https://git.smhi.se/ai-for-obs/data/-/raw/688c04f13e8e946962792fe4b4e0ded98800b154/raw_zarr/H%C3%84RN%C3%96SAND/DAGBOK_H%C3%A4rn%C3%B6sand_Station_1934.zarr.zip",
+        known_hash="sha256:a58fdb6521214d0bd569c9325ce78d696738de28ce6ec869cde0d46616b697f2",
+    )
+}
+
+
+def run_dawsonia(
+    table_fmt_config_override, first_page, last_page, book, gallery, progress=gr.Progress()
+):
+    if book is None:
+        raise ValueError("You need to select / upload the pages to digitize")
+    
+    progress(0, desc="Dawsonia: starting")
+
+    model_path = Path("data/models/dawsonia/2024-07-02")
+    output_path = Path("output")
+
+    print("Dawsonia: digitizing", book)
+    table_fmt = book.table_format
+
+    output_path_book = output_path / book.station_name
+    output_path_book.mkdir(exist_ok=True, parents=True)
+    (output_path_book / "probablities").mkdir(exist_ok=True)
+
+    init_data: list[dict[str, NDArray]] = [
+        {
+            key: np.empty(len(table_fmt.rows), dtype="O")
+            for key in table_fmt.columns[table_idx]
+        }
+        for table_idx in table_fmt.preproc.idx_tables_size_verify
+    ]
+
+    collection = []
+    images = []
+
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", FutureWarning)
+        for page_number, im_from_gallery in zip(range(first_page, last_page), gallery):
+            output_path_page = output_path_book / str(page_number)
+            gr.Info(f"Digitizing {page_number = }")
+
+            if not (output_path_book / str(page_number)).with_suffix(".parquet").exists():
+                digitize.digitize_page_and_write_output(
+                    book,
+                    init_data,
+                    page_number=page_number,
+                    date_str=f"0000-page-{page_number}",
+                    model_path=model_path,
+                    model_predict=ml.model_predict,
+                    prob_thresh=0.5,
+                    output_path_page=output_path_page,
+                    output_text_fmt=False,
+                    debug=False,
+                )
+            progress_value = (page_number - first_page) / max(1, last_page - first_page)
+
+            if results := read_page(output_path_book, str(page_number), progress, progress_value): # , im_from_gallery[0])
+                page, im = results
+                collection.append(page)
+                images.append(im)
+            else:
+                gr.Info(f"No tables detected in {page_number = }")
+
+
+    gr.Info("Pages were succesfully digitized ✨")
+
+    # yield collection, images
+    yield collection, gr.skip()
+
+
+def read_page(output_path_book: Path, prefix: str, progress, progress_value, im_path_from_gallery: str = ""):
+    stats = digitize.Statistics.from_json((output_path_book / "statistics" / prefix).with_suffix(".json"))
+    print(stats)
+    progress(progress_value, desc=f"Dawsonia: {stats!s:.50}")
+    if stats.tables_detected > 0:
+        values_df = pd.read_parquet((output_path_book / prefix).with_suffix(".parquet"))
+        table_meta = json.loads(
+            (output_path_book / "table_meta" / prefix).with_suffix(".json").read_text()
+        )
+        with Image.open(
+            image_path:=(output_path_book / "pages" / prefix).with_suffix(".webp")
+        ) as im:
+            width = im.width
+            height = im.height
+
+        values_array = values_df.values.flatten()
+        bbox_array = np.hstack(table_meta["table_positions"]).reshape(
+            -1, 4
+        )
+        cells = [
+            make_cell(value, bbox) for value, bbox in zip(values_array, bbox_array)
+        ]
+
+        return Page(width, height, cells, im_path_from_gallery or str(image_path)), im
+
+
+def make_cell(value: str, bbox: NDArray[np.int64]):
+    y, x, h, w = bbox
+    xmin, ymin = x-w//2, y-h//2
+    xmax, ymax = x+w//2, y+h//2
+    polygon = (xmin,ymin), (xmax, ymin), (xmax, ymax), (xmin, ymax), (xmin,ymin) 
+    return TableCell(polygon, text_x=x, text_y=y, text=value)
+
+
+def all_example_images() -> list[str]:
+    """
+    Get paths to all example images.
+    """
+    examples = [
+        os.path.join(EXAMPLES_DIRECTORY, f"{pipeline}.png") for pipeline in PIPELINES
+    ]
+    return examples
+
+
+def get_selected_example_image(
+    first_page, last_page, event: gr.SelectData
+) -> tuple[str, io.Book, str] | None:
+    """
+    Get the name of the pipeline that corresponds to the selected image.
+    """
+    # for name, details in PIPELINES.items():
+    name, _ext = event.value["image"]["orig_name"].split(".")
+
+    station_tf = Path("table_formats", name).with_suffix(".toml")
+
+    if (last_page - first_page) > MAX_IMAGES:
+        raise ValueError(f"Maximum images you can digitize is set to: {MAX_IMAGES}")
+
+    if name in PIPELINES:
+        book_path = pooch.retrieve(**PIPELINES[name], path=DATA_CACHE)
+        first, last, book = io.read_book(book_path)
+        book._name = name
+        book.size_cell = [1.0, 1.0, 1.0, 1.0]
+        return [book.read_image(pg) for pg in range(first_page, last_page)], book, book_path, station_tf.read_text()
+
+
+def overwrite_table_format_file(book: io.Book, book_path, table_fmt: str):
+    name = book.station_name
+    table_fmt_dir = Path("table_formats")
+    (table_fmt_dir / name).with_suffix(".toml").write_text(table_fmt)
+    book.table_format = io.read_specific_table_format(table_fmt_dir, Path(book_path))
+    gr.Info(f"Overwritten table format file for {name}")
+    return book
+
 
 with gr.Blocks() as submit:
+    gr.Markdown("# Upload")
     gr.Markdown(
-        "🛈 Select or upload the image you want to transcribe. You can upload up to five images at a time."
+        "Select or upload the image you want to transcribe. You can upload up to five images at a time."
     )
 
     batch_book_state = gr.State()
@@ -22,41 +197,25 @@ with gr.Blocks() as submit:
         with gr.Row(equal_height=True):
             with gr.Column(scale=5):
                 batch_image_gallery = gr.Gallery(
-                    # file_types=[".pdf", ".zarr.zip"],
-                    label="Preview",
-                    interactive=False,
-                    object_fit="contain",
-                    # scale=0.8,
-                )
-
-            with gr.Column(scale=2):
-                first_page = gr.Number(3, label="First page", precision=0,)
-                last_page = gr.Number(5, label="Last page", precision=0,)
-                table_fmt_filename = gr.Dropdown(
-                    [f.name for f in Path("table_formats").iterdir()],
+                    file_types=["image"],
+                    label="Image to digitize",
                     interactive=True,
-                    label="Select Table Format",
+                    object_fit="scale-down",
+                    scale=1,
                 )
 
+            with gr.Column(scale=2):
+                first_page = gr.Number(3, label="First page of the book", precision=0)
+                last_page = gr.Number(5, label="Last page of the book", precision=0)
                 examples = gr.Gallery(
                     all_example_images(),
-                    label="1a. Choose from the examples below, or",
+                    label="Examples",
                     interactive=False,
                     allow_preview=False,
                     object_fit="scale-down",
                     min_width=250,
-                    height=160,
-                )
-
-                upload_file = gr.File(
-                    label="1b. Upload a .pdf or .zarr.zip file",
-                    file_types=[".pdf", ".zarr.zip", ".zip"],
                 )
 
-                # upload_file_true_path = gr.Textbox(visible=False)
-
-                upload_button = gr.Button(value="1b. Upload", min_width=200)
-
     with Modal(visible=False) as edit_table_fmt_modal:
         with gr.Column():
             gr.Markdown(
@@ -64,9 +223,7 @@ with gr.Blocks() as submit:
                 "Write a custom table format, overriding the default one. "
                 "Click on the **Save** button when you are done."
             )
-            save_tf_button = gr.Button(
-                "Save", variant="primary", scale=0, min_width=200
-            )
+            save_tf_button = gr.Button("Save", variant="primary", scale=0, min_width=200)
             gr.HTML(
                 (
                     "<a href='https://dawsonia.readthedocs.io/en/latest/user_guide/misc.html#table-formats' target='_blank'>"
@@ -79,16 +236,7 @@ with gr.Blocks() as submit:
             table_fmt_config_override = gr.Code("", language="python")
 
     with gr.Row():
-        prob_thresh = gr.Slider(
-            minimum=0.0,
-            maximum=1.0,
-            value=0.75,
-            step=0.05,
-            label="Prediction probability threshold",
-        )
-
-    with gr.Row():
-        run_button = gr.Button("2. Digitize", variant="primary", scale=0, min_width=200)
+        run_button = gr.Button("Digitize", variant="primary", scale=0, min_width=200)
         edit_table_fmt_button = gr.Button(
             "Edit table format", variant="secondary", scale=0, min_width=200
         )
@@ -98,63 +246,30 @@ with gr.Blocks() as submit:
     examples.select(
         get_selected_example_image,
         (first_page, last_page),
-        (
-            batch_image_gallery,
-            batch_book_state,
-            batch_book_path_state,
-            table_fmt_filename,
-            table_fmt_config_override,
-        ),
+        (batch_image_gallery, batch_book_state, batch_book_path_state, table_fmt_config_override),
         trigger_mode="always_last",
     )
 
-    upload_file.upload(move_uploaded_file, inputs=[upload_file, table_fmt_filename], outputs=batch_book_path_state)
-
-    upload_button.click(
-        get_uploaded_image,
-        (first_page, last_page, table_fmt_filename, batch_book_path_state),
-        (
-            batch_image_gallery,
-            batch_book_state,
-            batch_book_path_state,
-            table_fmt_config_override,
-        ),
+    @batch_image_gallery.upload(
+        inputs=batch_image_gallery,
+        outputs=[batch_image_gallery],
     )
-
-    # @batch_image_gallery.upload(
-    #     inputs=batch_image_gallery,
-    #     outputs=[batch_image_gallery],
-    # )
-    # def validate_images(images):
-    #     print(images)
-    #     if len(images) > MAX_IMAGES:
-    #         gr.Warning(f"Maximum images you can upload is set to: {MAX_IMAGES}")
-    #         return gr.update(value=None)
-
-    #     gr.Warning(
-    #         "Digitizing uploaded images is not implemented yet! Work in progress!"
-    #     )
-    #     raise NotImplementedError("WIP")
-    #     return images
-
+    def validate_images(images):
+        if len(images) > MAX_IMAGES:
+            gr.Warning(f"Maximum images you can upload is set to: {MAX_IMAGES}")
+            return gr.update(value=None)
+        
+        gr.Warning("Digitizing uploaded images is not implemented yet! Work in progress!")
+        raise NotImplementedError("WIP")
+        return images
+    
     run_button.click(
         fn=run_dawsonia,
-        inputs=(
-            table_fmt_config_override,
-            first_page,
-            last_page,
-            prob_thresh,
-            batch_book_state,
-            batch_book_path_state,
-            batch_image_gallery,
-        ),
+        inputs=(table_fmt_config_override, first_page, last_page, batch_book_state, batch_image_gallery),
         outputs=(collection_submit_state, batch_image_gallery),
     )
 
     ## Table formats modal dialog box
     edit_table_fmt_button.click(lambda: Modal(visible=True), None, edit_table_fmt_modal)
     save_tf_button.click(
-        overwrite_table_format_file,
-        (batch_book_state, batch_book_path_state, table_fmt_config_override),
-        (batch_book_state,),
-    )
+        overwrite_table_format_file, (batch_book_state, batch_book_path_state, table_fmt_config_override), (batch_book_state,))

app/tabs/submit_functions.py

@@ -1,304 +0,0 @@
-import json
-import os
-from pathlib import Path
-import shutil
-import warnings
-
-from PIL import Image
-from dawsonia import io
-from dawsonia import digitize
-from dawsonia.ml import ml
-import gradio as gr
-import numpy as np
-from numpy.typing import NDArray
-import pandas as pd
-import pooch
-
-from .visualizer_functions import Page, TableCell
-
-# Max number of images a user can upload at once
-MAX_IMAGES = int(os.environ.get("MAX_IMAGES", 5))
-
-# Setup the cache directory to point to the directory where the example images
-# are located. The images must lay in the cache directory because otherwise they
-# have to be reuploaded when drag-and-dropped to the input image widget.
-GRADIO_CACHE = os.getenv("GRADIO_CACHE_DIR", ".gradio_cache")
-DATA_CACHE = os.path.join(GRADIO_CACHE, "data")
-EXAMPLES_DIRECTORY = os.path.join(os.getcwd(), "examples")
-
-# Example books
-PIPELINES: dict[str, dict[str, str]] = {
-    "bjuröklubb": dict(
-        url="https://git.smhi.se/ai-for-obs/data/-/raw/688c04f13e8e946962792fe4b4e0ded98800b154/raw_zarr/BJUR%C3%96KLUBB/DAGBOK_Bjur%C3%B6klubb_Station_Jan-Dec_1928.zarr.zip",
-        known_hash="sha256:6d87b7f79836ae6373cfab11260fe28787d93fe16199fefede6697ccd750f71a",
-    ),
-    "härnösand": dict(
-        url="https://git.smhi.se/ai-for-obs/data/-/raw/688c04f13e8e946962792fe4b4e0ded98800b154/raw_zarr/H%C3%84RN%C3%96SAND/DAGBOK_H%C3%A4rn%C3%B6sand_Station_1934.zarr.zip",
-        known_hash="sha256:a58fdb6521214d0bd569c9325ce78d696738de28ce6ec869cde0d46616b697f2",
-    ),
-}
-
-
-def run_dawsonia(
-    table_fmt_config_override,
-    first_page,
-    last_page,
-    prob_thresh,
-    book: io.Book,
-    book_path,
-    gallery,
-    progress=gr.Progress(),
-):
-    if book is None:
-        raise ValueError("You need to select / upload the pages to digitize")
-
-    progress(0, desc="Dawsonia: starting")
-
-    model_path = Path("data/models/dawsonia/2024-07-02")
-    output_path = Path("output")
-    output_path.mkdir(exist_ok=True)
-
-    print("Dawsonia: digitizing", book)
-    table_fmt = book.table_format
-
-    final_output_path_book = output_path / book.station_name
-    output_path_book = Path(book_path).parent / "output"
-    output_path_book.mkdir(exist_ok=True, parents=True)
-    (output_path_book / "probablities").mkdir(exist_ok=True)
-
-    init_data: list[dict[str, NDArray]] = [
-        {
-            key: np.empty(len(table_fmt.rows), dtype="O")
-            for key in table_fmt.columns[table_idx]
-        }
-        for table_idx in table_fmt.preproc.idx_tables_size_verify
-    ]
-
-    collection = []
-    images = []
-
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore", FutureWarning)
-        for page_number in range(first_page, last_page):
-            output_path_page = output_path_book / str(page_number)
-            gr.Info(f"Digitizing {page_number = }")
-
-            if (
-                not (output_path_book / str(page_number))
-                .with_suffix(".parquet")
-                .exists()
-            ):
-                digitize.digitize_page_and_write_output(
-                    book,
-                    init_data,
-                    page_number=page_number,
-                    date_str=f"0000-page-{page_number}",
-                    model_path=model_path,
-                    model_predict=ml.model_predict,
-                    prob_thresh=prob_thresh,
-                    output_path_page=output_path_page,
-                    output_text_fmt=False,
-                    debug=False,
-                )
-            _synctree(output_path_book, final_output_path_book)
-
-            progress_value = (page_number - first_page) / max(1, last_page - first_page)
-
-    # if final_output_path_book.exists():
-    #     shutil.rmtree(final_output_path_book)
-
-    # shutil.copytree(output_path_book, final_output_path_book)
-    for page_number, im_from_gallery in zip(range(first_page, last_page), gallery):
-        if results := read_page(
-            final_output_path_book,
-            str(page_number),
-            prob_thresh,
-            progress,
-            1.0,
-            table_fmt.preproc.idx_tables_size_verify,
-        ):  # , im_from_gallery[0])
-            page, im = results
-            collection.append(page)
-            images.append(im)
-            yield collection, gr.skip()
-        else:
-            gr.Info(f"No tables detected in {page_number = }")
-
-    gr.Info("Pages were succesfully digitized ✨")
-
-    # yield collection, images
-    yield collection, gr.skip()
-
-
-def _synctree(source_dir, dest_dir):
-    source_dir = Path(source_dir)
-    dest_dir = Path(dest_dir)
-    if not dest_dir.exists():
-        dest_dir.mkdir(parents=True)
-
-    for root, _, files in os.walk(source_dir):
-        root = Path(root)
-        relative_root = root.relative_to(source_dir)
-
-        # Create subdirectories in the destination directory
-        dest_subdir_path = dest_dir / relative_root
-        if not dest_subdir_path.exists():
-            dest_subdir_path.mkdir(parents=True, exist_ok=True)
-
-        for file_ in files:
-            source_file_path = root / file_
-            dest_file_path = dest_subdir_path / file_
-
-            # Copy only if the file does not already exist or is newer
-            if (
-                not dest_file_path.exists()
-                or (source_file_path.stat().st_mtime - dest_file_path.stat().st_mtime) > 0
-            ):
-                shutil.copy2(source_file_path, dest_file_path)
-
-
-def read_page(
-    output_path_book: Path,
-    prefix: str,
-    prob_thresh: float,
-    progress,
-    progress_value,
-    idx_tables_size_verify: list[int],
-    im_path_from_gallery: str = "",
-):
-    stats = digitize.Statistics.from_json(
-        (output_path_book / "statistics" / prefix).with_suffix(".json")
-    )
-    print(stats)
-    progress(progress_value, desc=f"Dawsonia: {stats!s:.50}")
-    if stats.tables_detected > 0:
-        values_df = pd.read_parquet((output_path_book / prefix).with_suffix(".parquet"))
-        prob_df = pd.read_parquet(
-            (output_path_book / "probablities" / prefix).with_suffix(".parquet")
-        )
-        table_meta = json.loads(
-            (output_path_book / "table_meta" / prefix).with_suffix(".json").read_text()
-        )
-        with Image.open(
-            image_path := (output_path_book / "pages" / prefix).with_suffix(".webp")
-        ) as im:
-            width = im.width
-            height = im.height
-
-        values_array = values_df.values.flatten()
-        prob_array = prob_df.values.flatten()
-        # FIXME: hardcoded to get upto 2 tables. Use idx_tables_size_verify and reconstruct bbox_array
-        try:
-            bbox_array = np.hstack(table_meta["table_positions"][:2]).reshape(-1, 4)
-        except ValueError:
-            bbox_array = np.reshape(table_meta["table_positions"][0], (-1, 4))
-
-        cells = [
-            make_cell(value, bbox)
-            for value, prob, bbox in zip(values_array, prob_array, bbox_array)
-            if prob > prob_thresh
-        ]
-
-        return Page(width, height, cells, im_path_from_gallery or str(image_path)), im
-
-
-def make_cell(value: str, bbox: NDArray[np.int64]):
-    y, x, h, w = bbox
-    xmin, ymin = x - w // 2, y - h // 2
-    xmax, ymax = x + w // 2, y + h // 2
-    polygon = (xmin, ymin), (xmax, ymin), (xmax, ymax), (xmin, ymax), (xmin, ymin)
-    return TableCell(polygon, text_x=x - w // 4, text_y=y, text=value)
-
-
-def all_example_images() -> list[str]:
-    """
-    Get paths to all example images.
-    """
-    examples = [
-        os.path.join(EXAMPLES_DIRECTORY, f"{pipeline}.png") for pipeline in PIPELINES
-    ]
-    return examples
-
-
-def get_selected_example_image(
-    first_page, last_page, event: gr.SelectData
-) -> tuple[list[Image.Image], io.Book, str, str, str] | None:
-    """
-    Get the name of the pipeline that corresponds to the selected image.
-    """
-    orig_name = event.value["image"]["orig_name"]
-    # for name, details in PIPELINES.items():
-    orig_path = Path(orig_name)
-    name = orig_path.name
-    for suffix in orig_path.suffixes[::-1]:
-        name = name.removesuffix(suffix)
-
-    station_tf = Path("table_formats", name).with_suffix(".toml")
-
-    if (last_page - first_page) > MAX_IMAGES:
-        error = f"Maximum images you can digitize is set to: {MAX_IMAGES}"
-        gr.Warning(error)
-        raise ValueError(error)
-
-    if name in PIPELINES:
-        book_path = pooch.retrieve(**PIPELINES[name], path=DATA_CACHE)
-        first, last, book = io.read_book(book_path)
-        book._name = name
-        book.size_cell = [1.0, 1.0, 1.0, 1.0]
-        return (
-            [book.read_image(pg) for pg in range(first_page, last_page)],
-            book,
-            book_path,
-            station_tf.name,
-            station_tf.read_text(),
-        )
-
-
-def move_uploaded_file(uploaded, table_fmt_filename):
-    current_directory = Path(uploaded).parent
-
-    # Define the target directory where you want to save the uploaded files
-    target_directory = current_directory / table_fmt_filename.removesuffix(".toml")
-    os.makedirs(target_directory, exist_ok=True)
-
-    # Move the uploaded file to the target directory
-    true_path = Path(target_directory / Path(uploaded).name)
-    # if true_path.exists():
-    #     true_path.unlink()
-
-    shutil.copy2(uploaded, true_path)
-    print(f"Copy created", true_path)
-    return str(true_path)
-
-
-def get_uploaded_image(
-    first_page: int, last_page: int, table_fmt_filename: str, filename: str
-) -> tuple[list[NDArray], io.Book, str, str] | None:
-
-    orig_path = Path(filename)
-    name = orig_path.name
-    for suffix in orig_path.suffixes[::-1]:
-        name = name.removesuffix(suffix)
-
-    station_tf = Path("table_formats", table_fmt_filename)
-    if not station_tf.exists():
-        station_tf = Path("table_formats", "bjuröklubb.toml")
-
-    first, last, book = io.read_book(Path(filename))
-    book._name = name
-    book.size_cell = [1.0, 1.0, 1.0, 1.0]
-    return (
-        [book.read_page(pg) for pg in range(first_page, last_page)],
-        book,
-        filename,
-        station_tf.read_text(),
-    )
-
-
-def overwrite_table_format_file(book: io.Book, book_path, table_fmt: str):
-    name = book.station_name
-    table_fmt_dir = Path("table_formats")
-    (table_fmt_dir / name).with_suffix(".toml").write_text(table_fmt)
-    book.table_format = io.read_specific_table_format(table_fmt_dir, Path(book_path))
-    gr.Info(f"Overwritten table format file for {name}")
-    return book

app/tabs/visualizer.py

@@ -1,15 +1,70 @@
+import os
 import gradio as gr
 from jinja2 import Environment, FileSystemLoader
+from typing_extensions import TypeAlias
 
 _ENV = Environment(loader=FileSystemLoader("app/assets/jinja-templates"))
 _IMAGE_TEMPLATE = _ENV.get_template("image.j2")
 
-from .visualizer_functions import render_image, toggle_navigation_button, activate_left_button, activate_right_button, right_button_click, left_button_click, update_image_caption
+from typing import NamedTuple, TypeAlias
+from dawsonia.typing import BBoxTuple
+
+
+class TableCell(NamedTuple):
+    polygon: tuple[tuple[int, int], ...]
+    text_x: int
+    text_y: int
+    text: str
+
+
+class Page(NamedTuple):
+    width: int
+    height: int
+    cells: list[TableCell]
+    path: str
+
+
+Collection: TypeAlias = list[Page]
+
+def render_image(collection: Collection, current_page_index: int) -> str:
+    return _IMAGE_TEMPLATE.render(
+        page=collection[current_page_index],
+    )
+
+def toggle_navigation_button(collection: Collection):
+    visible = len(collection) > 1
+    return gr.update(visible=visible)
+
+
+def activate_left_button(current_page_index):
+    interactive = current_page_index > 0
+    return gr.update(interactive=interactive)
+
+
+def activate_right_button(collection: Collection, current_page_index):
+    interactive = current_page_index + 1 < len(collection)
+    return gr.update(interactive=interactive)
+
+
+def right_button_click(collection: Collection, current_page_index):
+    max_index = len(collection) - 1
+    return min(max_index, current_page_index + 1)
+
+
+def left_button_click(current_page_index):
+    return max(0, current_page_index - 1)
+
+
+def update_image_caption(collection: Collection, current_page_index):
+    n_pages = len(collection)
+    label = os.path.split(collection[current_page_index].path)[-1]
+    return f"image {current_page_index + 1} of {n_pages}: `{label}`"
 
 
 with gr.Blocks() as visualizer:
+    gr.Markdown("# Result")
     gr.Markdown(
-        "🛈 The image to the below shows where Dawsonia found text in the image."
+        "The image to the below shows where Dawsonia found text in the image."
     )
 
     with gr.Row():
@@ -31,7 +86,7 @@ with gr.Blocks() as visualizer:
                     "← Previous", visible=False, interactive=False, scale=0
                 )
                 right = gr.Button("Next →", visible=False, scale=0)
-
+    
     collection = gr.State()
     current_page_index = gr.State(0)
 
@@ -40,7 +95,7 @@ with gr.Blocks() as visualizer:
     right.click(
         right_button_click, [collection, current_page_index], current_page_index
     )
-
+    
     # Updates on collection change:
     # - update the view
     # - reset the page index (always start on page 0)

app/tabs/visualizer_functions.py

@@ -1,62 +0,0 @@
-import os
-import gradio as gr
-from jinja2 import Environment, FileSystemLoader
-from typing_extensions import TypeAlias
-
-_ENV = Environment(loader=FileSystemLoader("app/assets/jinja-templates"))
-_IMAGE_TEMPLATE = _ENV.get_template("image.j2")
-
-from typing import NamedTuple, TypeAlias
-
-
-class TableCell(NamedTuple):
-    polygon: tuple[tuple[int, int], ...]
-    text_x: int
-    text_y: int
-    text: str
-
-
-class Page(NamedTuple):
-    width: int
-    height: int
-    cells: list[TableCell]
-    path: str
-
-
-Collection: TypeAlias = list[Page]
-
-
-def render_image(collection: Collection, current_page_index: int) -> str:
-    return _IMAGE_TEMPLATE.render(
-        page=collection[current_page_index],
-    )
-
-
-def toggle_navigation_button(collection: Collection):
-    visible = len(collection) > 1
-    return gr.update(visible=visible)
-
-
-def activate_left_button(current_page_index):
-    interactive = current_page_index > 0
-    return gr.update(interactive=interactive)
-
-
-def activate_right_button(collection: Collection, current_page_index):
-    interactive = current_page_index + 1 < len(collection)
-    return gr.update(interactive=interactive)
-
-
-def right_button_click(collection: Collection, current_page_index):
-    max_index = len(collection) - 1
-    return min(max_index, current_page_index + 1)
-
-
-def left_button_click(current_page_index):
-    return max(0, current_page_index - 1)
-
-
-def update_image_caption(collection: Collection, current_page_index):
-    n_pages = len(collection)
-    label = os.path.split(collection[current_page_index].path)[-1]
-    return f"image {current_page_index + 1} of {n_pages}: `{label}`"

pyproject.toml

@@ -16,17 +16,4 @@ dependencies = [
 
 [tool.uv.sources]
 # dawsonia = { url = "https://git.smhi.se/ai-for-obs/dawsonia/-/archive/v0.1.0b2/dawsonia-v0.1.0b2.tar.gz" }
-dawsonia = { url = "https://git.smhi.se/ai-for-obs/dawsonia/-/archive/1c252df1066e1d7bae9d95637b9493294537f7bf/dawsonia-1c252df1066e1d7bae9d95637b9493294537f7bf.zip" }
-
-[dependency-groups]
-dev = [
-    "ipykernel>=6.29.5",
-    "ipython>=8.32.0",
-    "onnxruntime>=1.20.1",
-    "pip>=25.1.1",
-    "pyqt6>=6.8.1",
-    "pytest>=8.3.5",
-]
-
-[tool.pytest.ini_options]
-pythonpath="."
+dawsonia = { url = "https://git.smhi.se/ai-for-obs/dawsonia/-/archive/e3dce11d60d07729a8a5004c5343647e84722d52/dawsonia-e3dce11d60d07729a8a5004c5343647e84722d52.tar.gz" }

run.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 source .venv/bin/activate
-export GRADIO_CACHE_DIR="$PWD/.gradio_cache"
-PYTHONPATH=$(pwd) gradio app/main.py
+GRADIO_CACHE_DIR=.gradio_cache PYTHONPATH=$(pwd) gradio app/main.py

table_formats/haparanda.toml

@@ -1,128 +0,0 @@
-[1925]
-version = 1
-
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1938-0]
-# Jan-Jun
-version = 0
-
-[1938-1]
-# Jul-Dec
-version = 2
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]

table_formats/hoburg.toml

@@ -1,128 +0,0 @@
-[1925]
-version = 1
-
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1938-0]
-# Jan-Jun
-version = 0
-
-[1938-1]
-# Jul-Dec
-version = 2
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]

table_formats/holmögadd.toml

@@ -1,132 +0,0 @@
-[1925]
-version = 1
-
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1930]
-# NOTE: starts with June and then Jan-May, some pages are crossed out (31-May)
-version = 0
-
-[1938-0]
-# Jan-Jun
-version = 0
-
-[1938-1]
-# Jul-Dec
-version = 2
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]

table_formats/landsort.toml

@@ -1,128 +0,0 @@
-[1925]
-version = 1
-
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1938-0]
-# Jan-Jun
-version = 0
-
-[1938-1]
-# Jul-Dec
-version = 2
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [8, 11, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]

table_formats/malmslätt.toml

@@ -1,88 +0,0 @@
-[1928]
-# row with time 2 and 19 actually stores some additional information with percentage
-# for the barometer and wet thermometer
-version = 1
-
-[1929]
-# row with time 2 and 19 actually stores some additional information with percentage
-# for the barometer and wet thermometer
-version = 1
-
-[1930-0]
-# rows change time frequently and inconsistently. For example 2 -> 8 and 8 -> 11
-version = 1
-
-[1930-1]
-version = 0
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-# Not exact, sometimes 6:30 -> 7 or 8 and 11 -> 10:30
-rows = [06:30:00, 8, 11, 14, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]

table_formats/samplan.toml

@@ -1,54 +0,0 @@
-[default]
-version = 0
-
-[default.preproc]
-corr_rotate = false
-idx_tables_size_verify = [0]
-row_idx_unit = "DAYS"
-table_modif = false
-
-[version.0]
-columns = [
-  "nederbörd_slag_0",
-  "nederbörd_slag_1",
-  "nederbörd_slag_2",
-  "nederbörd_slag_3",
-  "nederbörd_slag_4",
-  "nederbörd_mängd_0",
-  "nederbörd_mängd_1",
-  "nederbörd_mängd_2",
-  "nederbörd_mängd_3",
-  "nederbörd_mängd_sym",
-  "snötäcke_djup_0",
-  "snötäcke_djup_1",
-  "snötäcke_djup_2",
-  "snötäcke_djup_sym_0",
-  "snötäcke_djup_sym_1",
-  "obs_0",
-  "obs_1",
-  "kl_07_0",
-  "kl_07_1",
-  "kl_07_2",
-  "kl_07_3",
-  "kl_13_0",
-  "kl_13_1",
-  "kl_13_2",
-  "kl_13_3",
-  "kl_19_0",
-  "kl_19_1",
-  "kl_19_2",
-  "kl_19_3",
-  "max_temp_0",
-  "max_temp_1",
-  "max_temp_2",
-  "max_temp_3",
-  "min_temp_0",
-  "min_temp_1",
-  "min_temp_2",
-  "min_temp_3"
-]
-name_idx = "datum"
-rows = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
-tables = [
-  [32, 38]
-]

table_formats/vinga.toml

@@ -1,173 +0,0 @@
-[1925]
-version = 1
-
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1938-0]
-version = 0
-
-[1938-1]
-version = 2
-
-[1939]
-version = 2
-
-[1940]
-version = 2
-
-[1941]
-version = 2
-
-[1942]
-version = 3
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]
-
-[version.3]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "maximi_term",
-    "minimi_term",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek"
-  ],
-  [
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd",
-    "moln_het_sol_dimma_nederbörd_total",
-    "sikt",
-    "sjögang",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 23]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]

table_formats/visby.toml

@@ -1,165 +0,0 @@
-[1925]
-version = 1
-
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1938-0]
-# Jan-Jun
-version = 0
-
-[1938-1]
-# Jul-Dec
-version = 2
-
-[1948]
-version = 4
-
-[default]
-version = 0
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 2],
-  [7, 5]
-]
-
-[version.4]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "maximi_term",
-    "minimi_term",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek"
-  ],
-  [
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd",
-    "moln_het_sol_dimma_nederbörd_total",
-    "sikt",
-    "sjögang",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [1, 4, 7, 10, 13, 16, 19, 22]
-tables = [
-  [8, 9],
-  [8, 10],
-  [8, 5],
-  [8, 5]
-]

table_formats/öland.toml

@@ -1,128 +0,0 @@
-[1926]
-version = 1
-
-[1927]
-version = 1
-
-[1928]
-version = 1
-
-[1929]
-version = 1
-
-[1938-0]
-# Jan-Jun
-version = 0
-
-[1938-1]
-# Jul-Dec
-version = 2
-
-[default]
-version = 0
-
-[default.transforms]
-rotate = 90
-
-[version.0]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-name_idx = "tid"
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 10],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.1]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_högre",
-    "moln_mängd_total"
-  ],
-  [
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 8, 14, 19, 21]
-tables = [
-  [5, 8],
-  [5, 9],
-  [3, 1],
-  [4, 2],
-  [4, 5]
-]
-
-[version.2]
-columns = [
-  [
-    "term_på_baro",
-    "barom",
-    "torra_term",
-    "våta_term",
-    "moln_slag_lägre",
-    "moln_mängd_lägre",
-    "moln_slag_medel",
-    "moln_slag_högre",
-    "moln_höjd"
-  ],
-  [
-    "moln_het_sol_dimma_nederbörd_total",
-    "vind_riktning",
-    "vind_beaufort",
-    "vind_m_sek",
-    "sikt",
-    "sjögang",
-    "maximi_term",
-    "minimi_term",
-    "nederbörd_mängd",
-    "nederbörd_slag"
-  ]
-]
-rows = [2, 5, 8, 11, 14, 17, 19, 21]
-tables = [
-  [8, 9],
-  [8, 10],
-  [3, 1],
-  [7, 3],
-  [7, 5]
-]

tests/test_submit_functions.py

@@ -1,36 +0,0 @@
-def test_make_cell():
-    """
-    Test the make_cell function.
-    """
-    import numpy as np
-    from app.tabs.submit_functions import make_cell
-
-    # Arrange
-    value = "Hello, World!"
-    bbox = [10, 20, 30, 40]
-    
-    # Act
-    cell = make_cell(value, bbox)
-    
-    # Assert
-    expected_polygon = ((0, -5), (40, -5), (40, 25), (0, 25), (0, -5))
-    assert np.array_equal(cell.polygon, expected_polygon)
-
-
-def test_make_cell_for_text_position():
-    """
-    Test the make_cell function for text position.
-    """
-    import numpy as np
-    from app.tabs.submit_functions import make_cell
-    
-    # Arrange
-    value = "Hello, World!"
-    bbox = [10, 20, 30, 40]
-
-    # Act
-    cell = make_cell(value, bbox)
-
-    # Assert
-    text_position = 10, 10
-    assert (cell.text_x, cell.text_y) == text_position