diff --git a/.gitignore b/.gitignore
index d9c858c..8ad2561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,7 @@ celerybeat-schedule
celerybeat.pid
*.sage.py
.env
+.venv
env/
venv/
ENV/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6bae9a4..e8b115c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ files: src|tests
exclude: ^$
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v6.0.0
+ rev: v4.6.0
hooks:
- id: trailing-whitespace
args: [ --markdown-linebreak-ext=md ]
@@ -18,6 +18,7 @@ repos:
- id: mixed-line-ending
args: [ --fix=lf ]
+
- repo: local
hooks:
@@ -33,7 +34,7 @@ repos:
- html
- id: ruff-format
- name: uv run ruff format
+ name: ruff format
language: system
entry: ruff format .
exclude: LICENSE|charts
@@ -46,7 +47,7 @@ repos:
- id: ruff-check
name: ruff check
language: system
- entry: uv run ruff check . --fix --exit-non-zero-on-fix
+ entry: ruff check . --fix --exit-non-zero-on-fix
exclude: LICENSE|charts
exclude_types:
- markdown
diff --git a/.python-version b/.python-version
index 24ee5b1..2c07333 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-3.13
+3.11
diff --git a/CHANGELOG b/CHANGELOG
index 8c9f3ba..ee239a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,133 +2,6 @@
All notable changes to this project will be documented in this file.
-## [0.3.6] - 2025-06-06
-
-### ๐ Features
-
-- Add `Quote.is_active` field
-
-## [0.3.5] - 2025-05-27
-
-### ๐ Features
-
-- Implement remaining repo methods for chatbot and quote
-- Add ANO_PREFIX bot response
-
-### โ๏ธ Miscellaneous Tasks
-
-- Add renovate lockFileMaintenance
-
-## [0.3.3] - 2025-03-06
-
-### ๐ Bug Fixes
-
-- Have uvicorn use Settings.port and Settings.host
-
-## [0.3.2] - 2025-03-06
-
-### โ๏ธ Miscellaneous Tasks
-
-- Update charts to v0.3.2
-
-## [0.3.1] - 2025-03-06
-
-### ๐ Bug Fixes
-
-- Correctly execute `make serve`
-
-## [0.3.0] - 2025-03-06
-
-### ๐ Features
-
-- Remove !h and make the bot have an in-memory dict of greeted users instead of using the backoff service
-- Add UpdateVersionAction
-- Add retry capabilities to the bot
-
-## [0.2.9] - 2025-02-24
-
-### ๐ Bug Fixes
-
-- Update token refresh to use object attributes instead of dict access
-
-## [0.2.8] - 2025-02-24
-
-### ๐ Bug Fixes
-
-- Retrieve user profile after refreshing twitch creds
-
-### โ๏ธ Miscellaneous Tasks
-
-- Update to v0.2.6
-
-## [0.2.7] - 2025-02-13
-
-### ๐ Bug Fixes
-
-- Don't print the full author/user object when calling Quote().to_pretty()
-
-### โ๏ธ Miscellaneous Tasks
-
-- Update to v0.2.6
-
-## [0.2.6] - 2025-02-13
-
-### ๐ Features
-
-- Revamp authentication -- remove twitch's tokens from our own wrapper token
-- Add GetRandomQuoteAction
-- Change QuoteStorerSvc to use the new quote repo instead of the legacy db object
-
-## [0.2.5] - 2024-12-19
-
-### ๐ Bug Fixes
-
-- Fix logout flow which wasn't being triggered, remove useless html code
-
-## [0.2.4] - 2024-12-19
-
-### ๐ Features
-
-- Add backoff service and some message reactions
-
-### โ๏ธ Miscellaneous Tasks
-
-- Update to v0.2.4 and remove useless code
-
-## [0.2.3] - 2024-12-18
-
-### ๐งช Testing
-
-- Add base tests
-
-### โ๏ธ Miscellaneous Tasks
-
-- Update to v0.2.3
-
-## [0.2.2] - 2024-12-17
-
-### ๐ Features
-
-- Add migrations, api bot endpoints and revamp the whole twitch backend by making use of twitchio
-
-## [0.2.1] - 2024-12-12
-
-### ๐ Features
-
-- Add GET /tts/permalink
-- Add channel name input validation
-- Reduce execution queue length to 5 from 25
-
-## [0.2.0] - 2024-12-12
-
-### ๐ Features
-
-- Remove kivy frontend, add litestar
-
-### โ๏ธ Miscellaneous Tasks
-
-- Update CHANGELOG
-
## [0.1.2] - 2024-11-05
### ๐ Features
diff --git a/Dockerfile b/Dockerfile
index 11e854f..226e72a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ ENV PYTHONPATH="$APP_PATH"
ENV PATH="$APP_HOME/.local/bin:$PATH"
# hadolint ignore=DL3001,DL3008,DL3018
-RUN apk add --no-cache make python3~=3.13 curl git \
+RUN apk add --no-cache make python3~=3.12 \
&& adduser -S -u "$USERID" -h "$APP_HOME" "$USERNAME" \
&& mkdir -p "$APP_PATH" \
&& chown -R "$USERID:$GROUPID" "$APP_PATH"
@@ -29,10 +29,9 @@ WORKDIR "$APP_PATH"
COPY --chown=$USERNAME pyproject.toml uv.lock Makefile README.md ./
-COPY --chown=$USERNAME src/ src/
-
RUN uv sync
+COPY --chown=$USERNAME src/ src/
COPY --chown=$USERNAME migrations/ migrations/
@@ -40,7 +39,6 @@ FROM base AS serve
CMD ["make", "serve"]
-
FROM base AS migrate
CMD ["make", "migrate"]
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index be3f7b2..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- 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.
-
-
- Copyright (C)
-
- 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 .
-
-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
-.
diff --git a/Makefile b/Makefile
index 0ea7ff8..9b87ccf 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,14 @@ PROJECT_TARGET := "serve"
fmt:
uvx pre-commit run --all-files --color always
-fmt--mypy:
- uvx pre-commit run --all-files --color always mypy
-
-fmt--add-noqa:
- uvx ruff check --add-noqa .
-
-fmt--autoupdate:
- uvx pre-commit autoupdate
-
-
.PHONY: tests
tests:
- uv run pytest --cov=src -vv tests
+ uv run pytest --cov=halig -vv tests --report-log reportlog.json
uv run coverage html
uv run coverage xml
serve:
- uv run python src/apps/httpapi/litestar/main.py
+ uv run python -m src.huesoporro.main
build:
docker build . -t git.roboces.dev/catalin/$(PROJECT_NAME):$(PROJECT_TAG) --target $(PROJECT_TARGET)
diff --git a/charts/huesoporro/Chart.yaml b/charts/huesoporro/Chart.yaml
index 60426a1..ac75742 100644
--- a/charts/huesoporro/Chart.yaml
+++ b/charts/huesoporro/Chart.yaml
@@ -1,6 +1,24 @@
apiVersion: v2
-appVersion: 0.3.7
-description: A Helm chart for Kubernetes
name: huesoporro
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application
-version: 0.3.7
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.2.2
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "0.2.2"
diff --git a/charts/huesoporro/values.yaml b/charts/huesoporro/values.yaml
index b7987a8..ffa36f2 100644
--- a/charts/huesoporro/values.yaml
+++ b/charts/huesoporro/values.yaml
@@ -1,62 +1,138 @@
-affinity: {}
-autoscaling:
- enabled: false
- maxReplicas: 100
- minReplicas: 1
- targetCPUUtilizationPercentage: 80
-fullnameOverride: ''
+# Default values for helm.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
+replicaCount: 1
+
+# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
image:
- pullPolicy: Always
repository: git.roboces.dev/catalin/huesoporro
- tag: 0.3.7
+ # This sets the pull policy for images.
+ pullPolicy: Always
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: "0.2.2"
+
+# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
imagePullSecrets: []
-ingress:
+# This is to override the chart name.
+nameOverride: ""
+fullnameOverride: ""
+
+#This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
+serviceAccount:
+ # Specifies whether a service account should be created
+ create: true
+ # Automatically mount a ServiceAccount's API credentials?
+ automount: true
+ # Annotations to add to the service account
annotations: {}
- className: ''
+ # The name of the service account to use.
+ # If not set and create is true, a name is generated using the fullname template
+ name: ""
+
+# This is for setting Kubernetes Annotations to a Pod.
+# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+podAnnotations: {}
+# This is for setting Kubernetes Labels to a Pod.
+# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+
+podSecurityContext: {}
+ # fsGroup: 2000
+
+securityContext: {}
+ # capabilities:
+ # drop:
+ # - ALL
+ # readOnlyRootFilesystem: true
+ # runAsNonRoot: true
+ # runAsUser: 1000
+
+# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/
+service:
+ # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
+ type: LoadBalancer
+ # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
+ port: 8000
+
+# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
+ingress:
enabled: false
+ className: ""
+ annotations: {}
+ # kubernetes.io/ingress.class: nginx
+ # kubernetes.io/tls-acme: "true"
hosts:
- - host: chart-example.local
- paths:
- - path: /
- pathType: ImplementationSpecific
+ - host: chart-example.local
+ paths:
+ - path: /
+ pathType: ImplementationSpecific
tls: []
+ # - secretName: chart-example-tls
+ # hosts:
+ # - chart-example.local
+
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ # limits:
+ # cpu: 100m
+ # memory: 128Mi
+ # requests:
+ # cpu: 100m
+ # memory: 128Mi
+
+# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
livenessProbe:
httpGet:
path: /healthz
port: http
-nameOverride: ''
-nodeSelector: {}
-persistence:
- accessModes:
- - ReadWriteMany
- annotations: {}
- enabled: false
- size: 10Gi
- storageClassName: default
- volumeOwner:
- enabled: true
- gid: 1000
- uid: 1000
-podAnnotations: {}
-podLabels: {}
-podSecurityContext: {}
readinessProbe:
httpGet:
path: /healthz
port: http
-replicaCount: 1
-resources: {}
-secret:
- existingSecretName: huesoporro-secrets
-securityContext: {}
-service:
- port: 8000
- type: LoadBalancer
-serviceAccount:
- annotations: {}
- automount: true
- create: true
- name: ''
-tolerations: []
-volumeMounts: []
+
+#This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
+autoscaling:
+ enabled: false
+ minReplicas: 1
+ maxReplicas: 100
+ targetCPUUtilizationPercentage: 80
+ # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
volumes: []
+# - name: foo
+# secret:
+# secretName: mysecret
+# optional: false
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+# mountPath: "/etc/foo"
+# readOnly: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+persistence:
+ enabled: false
+ accessModes:
+ - ReadWriteMany
+ size: 10Gi
+ storageClassName: "default"
+ volumeOwner:
+ enabled: true
+ uid: 1000
+ gid: 1000
+ annotations: {}
+
+secret:
+ existingSecretName: huesoporro-secrets
\ No newline at end of file
diff --git a/devenv.lock b/devenv.lock
index 2c79112..8ab1706 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,10 +3,10 @@
"devenv": {
"locked": {
"dir": "src/modules",
- "lastModified": 1739362938,
+ "lastModified": 1733788855,
"owner": "cachix",
"repo": "devenv",
- "rev": "27276816caa1718f8b8e8d53d64cc18da059e101",
+ "rev": "d59fee8696cd48f69cf79f65992269df9891ba86",
"type": "github"
},
"original": {
@@ -17,21 +17,6 @@
}
},
"flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1747046372,
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1733328505,
@@ -46,31 +31,10 @@
"type": "github"
}
},
- "git-hooks": {
- "inputs": {
- "flake-compat": "flake-compat",
- "gitignore": "gitignore",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1747372754,
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "type": "github"
- }
- },
"gitignore": {
"inputs": {
"nixpkgs": [
- "git-hooks",
+ "pre-commit-hooks",
"nixpkgs"
]
},
@@ -102,35 +66,48 @@
"type": "github"
}
},
- "nixpkgs-python": {
+ "nixpkgs-stable": {
+ "locked": {
+ "lastModified": 1733730953,
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "7109b680d161993918b0a126f38bc39763e5a709",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "pre-commit-hooks": {
"inputs": {
- "flake-compat": "flake-compat_2",
+ "flake-compat": "flake-compat",
+ "gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
- ]
+ ],
+ "nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1733319315,
+ "lastModified": 1733665616,
"owner": "cachix",
- "repo": "nixpkgs-python",
- "rev": "01263eeb28c09f143d59cd6b0b7c4cc8478efd48",
+ "repo": "pre-commit-hooks.nix",
+ "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
"type": "github"
},
"original": {
"owner": "cachix",
- "repo": "nixpkgs-python",
+ "repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": {
"inputs": {
"devenv": "devenv",
- "git-hooks": "git-hooks",
"nixpkgs": "nixpkgs",
- "nixpkgs-python": "nixpkgs-python",
- "pre-commit-hooks": [
- "git-hooks"
- ]
+ "pre-commit-hooks": "pre-commit-hooks"
}
}
},
diff --git a/devenv.nix b/devenv.nix
index 06edec4..771f4d7 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -7,9 +7,15 @@
languages.python.enable = true;
languages.python.uv.enable = true;
- languages.python.version = "3.12.8";
+
+ scripts.hello.exec = ''
+ echo hello from $GREET
+ '';
enterShell = ''
+ hello
+ git --version
+ fish
'';
dotenv.enable = true;
diff --git a/devenv.yaml b/devenv.yaml
index 184b866..116a2ad 100644
--- a/devenv.yaml
+++ b/devenv.yaml
@@ -1,8 +1,15 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
inputs:
nixpkgs:
url: github:cachix/devenv-nixpkgs/rolling
- nixpkgs-python:
- url: github:cachix/nixpkgs-python
- inputs:
- nixpkgs:
- follows: nixpkgs
+
+# If you're using non-OSS software, you can set allowUnfree to true.
+# allowUnfree: true
+
+# If you're willing to use a package that's vulnerable
+# permittedInsecurePackages:
+# - "openssl-1.1.1w"
+
+# If you have more than one devenv you can merge them
+#imports:
+# - ./backend
diff --git a/migrations/20241219191711_sentences.py b/migrations/20241219191711_sentences.py
deleted file mode 100644
index 06830e0..0000000
--- a/migrations/20241219191711_sentences.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""
-This module contains a Caribou migration.
-
-Migration Name: sentences
-Migration Version: 20241219191711
-"""
-
-
-def upgrade(connection):
- # update table `sentences` to have a user_id row
- # which references users.id
- # and a channel VARCHAR(255) row
-
- sql = """
- DROP TABLE IF EXISTS sentences;
- """
- connection.execute(sql)
- connection.commit()
- sql = """
- CREATE TABLE sentences(
- id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
- sentence VARCHAR(255) NOT NULL UNIQUE,
- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- last_updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- user_id VARCHAR(255) NOT NULL,
- FOREIGN KEY (user_id) REFERENCES users(id)
- );
- """
- connection.execute(sql)
- connection.commit()
-
-
-def downgrade(connection):
- # add your downgrade step here
- pass
diff --git a/migrations/20250112153541_user_external_auth.py b/migrations/20250112153541_user_external_auth.py
deleted file mode 100644
index d873a70..0000000
--- a/migrations/20250112153541_user_external_auth.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-This module contains a Caribou migration.
-
-Migration Name: user_external_auth
-Migration Version: 20250112153541
-"""
-
-
-def upgrade(connection):
- """
- - delete access_token, refresh_token, and expires_at from users
- - add external_auth table which will store the external auths:
- - type: twitch or discord
- - credentials: JSON
- """
-
- sql = """
- ALTER TABLE users DROP COLUMN access_token;
- """
- connection.execute(sql)
- sql = """
- ALTER TABLE users DROP COLUMN refresh_token;
- """
- connection.execute(sql)
- sql = """
- ALTER TABLE users DROP COLUMN expires_at;
- """
- connection.execute(sql)
-
- sql = """
- CREATE TABLE external_auth(
- id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
- type VARCHAR(255) NOT NULL,
- credentials JSON NOT NULL
- );
- """
- connection.execute(sql)
-
- sql = """
- CREATE TABLE user_external_auth(
- user_id VARCHAR(255) NOT NULL,
- external_auth_id INTEGER NOT NULL,
- FOREIGN KEY (user_id) REFERENCES users(id),
- FOREIGN KEY (external_auth_id) REFERENCES external_auth(id)
- );
- """
- connection.execute(sql)
- connection.commit()
-
-
-def downgrade(connection):
- # add your downgrade step here
- pass
diff --git a/migrations/20250113142241_external_auth_json.py b/migrations/20250113142241_external_auth_json.py
deleted file mode 100644
index e92e847..0000000
--- a/migrations/20250113142241_external_auth_json.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""
-This module contains a Caribou migration.
-
-Migration Name: external_auth_json
-Migration Version: 20250113142241
-"""
-
-
-def upgrade(connection):
- """remove tables:
- - external_auth
- - user_external_auth
- add column to users table:
- - external_auth JSON
- """
- sql = """
- DROP TABLE IF EXISTS external_auth;
- """
- connection.execute(sql)
-
- sql = """
- DROP TABLE IF EXISTS user_external_auth;
- """
- connection.execute(sql)
-
- sql = """
- ALTER TABLE users ADD COLUMN external_auth JSON;
- """
- connection.execute(sql)
- connection.commit()
-
-
-def downgrade(connection):
- # add your downgrade step here
- pass
diff --git a/migrations/20250226120422_rename_settings_to_chatbot.py b/migrations/20250226120422_rename_settings_to_chatbot.py
deleted file mode 100644
index 0a697be..0000000
--- a/migrations/20250226120422_rename_settings_to_chatbot.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-This module contains a Caribou migration.
-
-Migration Name: rename_settings_to_chatbot
-Migration Version: 20250226120422
-"""
-
-
-def upgrade(connection):
- sql = """
- ALTER TABLE settings RENAME TO chatbot;
- """
- connection.execute(sql)
- connection.commit()
-
-
-def downgrade(connection):
- # add your downgrade step here
- pass
diff --git a/migrations/20250228112643_uuids.py b/migrations/20250228112643_uuids.py
deleted file mode 100644
index a283219..0000000
--- a/migrations/20250228112643_uuids.py
+++ /dev/null
@@ -1,154 +0,0 @@
-"""
-This module contains a Caribou migration.
-
-Migration Name: uuids
-Migration Version: 20250228112643
-"""
-
-import uuid
-
-
-def upgrade(connection):
- """Several major upgrades
- - Update all table's id columns to be UUIDs.
- - Update the user's table `user` column to be named `username`
- - Update the chatbot's table `user_id` column to reference the `id` column in the user's table,
- thus changing the foreign key constraint.
- """
-
- # First, create temporary tables with the new schema
- connection.execute("""
- CREATE TABLE users_new (
- id TEXT not null PRIMARY KEY,
- username varchar(255) not null UNIQUE,
- last_updated_at TIMESTAMP default CURRENT_TIMESTAMP,
- created_at TIMESTAMP default CURRENT_TIMESTAMP,
- external_auth JSON
- );
- """)
-
- # Fetch users to generate UUIDs in Python
- users = connection.execute(
- "SELECT user, last_updated_at, created_at, external_auth FROM users"
- ).fetchall()
-
- # Copy data from old users table to new users table, using Python-generated UUIDs
- for user in users:
- new_uuid = uuid.uuid4().hex
- # Safely handle JSON
-
- connection.execute(
- """
- INSERT INTO users_new (id, username, last_updated_at, created_at, external_auth)
- VALUES (?, ?, ?, ?, ?)
- """,
- (new_uuid, user[0], user[1], user[2], user[3]),
- )
-
- # Create temporary quotes table with new schema
- connection.execute("""
- CREATE TABLE quotes_new (
- id TEXT not null PRIMARY KEY,
- quote varchar(255) not null UNIQUE,
- author varchar(255),
- channel varchar(255),
- created_at TIMESTAMP default CURRENT_TIMESTAMP,
- last_updated_at TIMESTAMP default CURRENT_TIMESTAMP
- );
- """)
-
- # Fetch quotes to generate UUIDs in Python
- quotes = connection.execute(
- "SELECT quote, author, channel, created_at, last_updated_at FROM quotes"
- ).fetchall()
-
- # Copy data from old quotes table to new quotes table, using Python-generated UUIDs
- for quote in quotes:
- new_uuid = uuid.uuid4().hex
- connection.execute(
- """
- INSERT INTO quotes_new (id, quote, author, channel, created_at, last_updated_at)
- VALUES (?, ?, ?, ?, ?, ?)
- """,
- (new_uuid, quote[0], quote[1], quote[2], quote[3], quote[4]),
- )
-
- # Create mapping table to store the relationship between old user IDs and new UUIDs
- connection.execute("""
- CREATE TEMPORARY TABLE user_id_mapping (
- old_user VARCHAR(255) not null,
- new_id TEXT not null
- );
- """)
-
- # Populate the mapping table
- connection.execute("""
- INSERT INTO user_id_mapping (old_user, new_id)
- SELECT username, id FROM users_new;
- """)
-
- # Create temporary chatbot table with new schema
- connection.execute("""
- CREATE TABLE chatbot_new (
- id TEXT not null PRIMARY KEY,
- user_id TEXT not null UNIQUE,
- automatic_generation_timer INTEGER default 300 not null,
- automatic_quote_timer INTEGER default 500 not null,
- mods VARCHAR(255),
- created_at TIMESTAMP default CURRENT_TIMESTAMP,
- last_updated_at TIMESTAMP default CURRENT_TIMESTAMP,
- FOREIGN KEY (user_id) REFERENCES users_new (id)
- );
- """)
-
- # Fetch chatbot data to generate UUIDs in Python
- chatbots = connection.execute(
- "SELECT user_id, automatic_generation_timer, automatic_quote_timer, mods, created_at, last_updated_at FROM chatbot"
- ).fetchall()
-
- # Copy data from old chatbot table to new chatbot table with updated foreign key
- for chatbot in chatbots:
- # Get the new UUID for the user
- user_mapping = connection.execute(
- "SELECT new_id FROM user_id_mapping WHERE old_user = ?", (chatbot[0],)
- ).fetchone()
- new_user_id = user_mapping[0] if user_mapping else None
-
- if new_user_id:
- new_chatbot_uuid = uuid.uuid4().hex
- connection.execute(
- """
- INSERT INTO chatbot_new (id, user_id, automatic_generation_timer, automatic_quote_timer, mods, created_at, last_updated_at)
- VALUES (?, ?, ?, ?, ?, ?, ?)
- """,
- (
- new_chatbot_uuid,
- new_user_id,
- chatbot[1],
- chatbot[2],
- chatbot[3],
- chatbot[4],
- chatbot[5],
- ),
- )
-
- # Drop old tables
- connection.execute("DROP TABLE chatbot;")
- connection.execute("DROP TABLE quotes;")
- connection.execute("DROP TABLE users;")
-
- # Rename new tables to original names
- connection.execute("ALTER TABLE users_new RENAME TO users;")
- connection.execute("ALTER TABLE quotes_new RENAME TO quotes;")
- connection.execute("ALTER TABLE chatbot_new RENAME TO chatbot;")
-
- # Drop temporary mapping table
- connection.execute("DROP TABLE user_id_mapping;")
-
- # Commit all changes
- connection.commit()
-
-
-def downgrade(connection):
- # add your downgrade step here
- pass
diff --git a/migrations/20250606143836_active_quotes.py b/migrations/20250606143836_active_quotes.py
deleted file mode 100644
index a501ec1..0000000
--- a/migrations/20250606143836_active_quotes.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""
-This module contains a Caribou migration.
-
-Migration Name: active_quotes
-Migration Version: 20250606143836
-"""
-
-
-def upgrade(connection):
- # add `is_active` column to the `quotes` table
- sql = """
-ALTER TABLE quotes
-ADD COLUMN is_active BOOLEAN DEFAULT TRUE;
- """
- connection.execute(sql)
- connection.commit()
-
-
-def downgrade(connection):
- # add your downgrade step here
- pass
diff --git a/pyproject.toml b/pyproject.toml
index 01479b3..543c278 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
[project]
name = "huesoporro"
-version = "0.3.7"
-description = "Misc Twitch bot"
+version = "0.2.2"
+description = "Misc Twitch bots"
readme = "README.md"
authors = [
{ name = "185504a9", email = "catalin@roboces.dev" }
@@ -12,38 +12,26 @@ dependencies = [
"platformdirs>=4.3.6",
"pydantic>=2.9.2",
"pydantic-settings>=2.6.0",
+ "pyinstaller>=6.11.0",
+ "twitchwebsocket>=1.2.1",
"loguru>=0.7.2",
+ "ffmpeg>=1.4",
+ "ffmpeg-python>=0.2.0",
"gtts>=2.5.4",
"litestar[standard]>=2.13.0",
"httpx>=0.28.0",
"caribou>=0.4.1",
"aiosqlite>=0.20.0",
"pyjwt>=2.10.1",
- "twitchio==2.10.0",
+ "huey>=2.5.2",
+ "twitchio>=2.10.0",
"redis>=5.2.1",
- "pytz>=2024.2",
- "discord-py>=2.4.0",
- "tenacity>=9.0.0",
- "uvicorn>=0.34.0",
- "sniffio>=1.3.1",
+ "pytest>=8.3.4",
]
-[project.scripts]
-huesoporro = "apps.cli.typer.main:app"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
[tool.uv]
dev-dependencies = [
"mypy>=1.13.0",
- "pytest>=8.3.4",
- "pytest-asyncio>=0.25.0",
- "ruff>=0.8.3",
- "pytest-coverage>=0.0",
- "polyfactory>=2.18.1",
- "types-pyyaml>=6.0.12.20241230",
]
[[tool.mypy.overrides]]
@@ -54,11 +42,7 @@ module = [
"nltk.tokenize.destructive",
"TwitchWebsocket",
"tokenizer",
- "caribou.migrate",
- "twitchio",
- "twitchio.ext",
- "gtts",
- "yt_dlp"
+ "gtts"
]
ignore_missing_imports = true
@@ -67,14 +51,4 @@ extend-select = [
"W", "C90", "I", "N", "UP", "S", "BLE", "B", "A", "COM", "C4", "DTZ", "T10", "EM", "ISC", "T20", "PT", "RSE", "RET",
"SIM", "PTH", "ERA", "PGH", "PL", "RUF", "FURB", "PERF"
]
-extend-ignore = ["S101", "ISC002", "COM812", "ISC001", "EM101", "EM102"]
-
-[tool.pytest.ini_options]
-asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "function"
-
-[dependency-groups]
-cli = [
- "typer>=0.15.1",
- "yt-dlp>=2025.1.26",
-]
+extend-ignore = ["S101", "ISC002", "COM812", "ISC001"]
diff --git a/renovate.json5 b/renovate.json5
deleted file mode 100644
index 3d0d473..0000000
--- a/renovate.json5
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- $schema: "https://docs.renovatebot.com/renovate-schema.json",
- lockFileMaintenance: {
- enabled: true,
- },
-}
diff --git a/src/apps/__init__.py b/src/__init__.py
similarity index 100%
rename from src/apps/__init__.py
rename to src/__init__.py
diff --git a/src/apps/cli/typer/main.py b/src/apps/cli/typer/main.py
deleted file mode 100644
index e6c482f..0000000
--- a/src/apps/cli/typer/main.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from pathlib import Path
-
-from loguru import logger
-from typer import Typer
-
-from huesoporro.actions.import_from_vod import ImportFromVODAction
-from huesoporro.actions.misc.update_version_action import UpdateVersionAction
-from huesoporro.settings import Settings
-from huesoporro.svc.clean_cc_svc import CleanCCSvc
-from huesoporro.svc.download_closed_captions import DownloadClosedCaptionsSvc
-
-app = Typer()
-
-
-@app.command()
-def import_vod(channel_name: str, youtube_url: str, db_path: Path | None = None):
- logger.info(f"Importing VOD closed captions for {channel_name} from {youtube_url}")
- s = Settings.get(db_filepath=db_path)
- import_from_vod_action = ImportFromVODAction(
- download_closed_captions_svc=DownloadClosedCaptionsSvc(),
- clean_cc_svc=CleanCCSvc(),
- s=s,
- )
- for cc_filepath in import_from_vod_action.run(channel_name, youtube_url):
- logger.info(f"Closed captions imported from {cc_filepath}")
-
-
-@app.command()
-def update_version(version: str, dry_run: bool = False):
- UpdateVersionAction().run(version, dry_run)
diff --git a/src/apps/httpapi/__init__.py b/src/apps/httpapi/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/apps/httpapi/litestar/__init__.py b/src/apps/httpapi/litestar/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/apps/httpapi/litestar/dependencies.py b/src/apps/httpapi/litestar/dependencies.py
deleted file mode 100644
index 7f3bceb..0000000
--- a/src/apps/httpapi/litestar/dependencies.py
+++ /dev/null
@@ -1,176 +0,0 @@
-from litestar import Request
-from litestar.exceptions import HTTPException
-
-from huesoporro.actions.chatbot.create_or_update_chatbot import (
- CreateOrUpdateChatbotAction,
-)
-from huesoporro.actions.chatbot.get_chatbot_by_user_id import GetChatbotByUserIdAction
-from huesoporro.actions.users.authenticate_user import AuthenticateUserAction
-from huesoporro.actions.users.get_user_by_jwt import GetUserByJWTAction
-from huesoporro.bot import BotsManager
-from huesoporro.infra.authenticator import TwitchAuthenticator
-from huesoporro.infra.repos import ChatbotRepo, UserRepo
-from huesoporro.libs.db import MarkovDatabase
-from huesoporro.models import Chatbot, User
-from huesoporro.settings import Settings
-from huesoporro.svc.chatbot_svcs import (
- CreateChatbotSvc,
- GetChatbotByUserIdSvc,
- UpdateChatbotSvc,
-)
-from huesoporro.svc.store import SentenceStorerSvc
-from huesoporro.svc.users_svcs import (
- CreateUserSvc,
- GetTwitchAuthByAuthCodeSvc,
- GetUserByUsernameSvc,
- IsValidTokenSvc,
- RefreshTokenSvc,
- UpdateUserSvc,
-)
-
-
-async def get_settings() -> Settings:
- return Settings.get()
-
-
-async def get_authenticator(s: Settings) -> TwitchAuthenticator:
- return TwitchAuthenticator(s=s)
-
-
-async def get_chatbot_repo(s: Settings):
- return ChatbotRepo(s=s)
-
-
-async def get_get_chatbot_by_user_id_svc(chatbot_repo: ChatbotRepo):
- return GetChatbotByUserIdSvc(repo=chatbot_repo)
-
-
-async def get_get_tokens_by_auth_code_svc(
- twitch_authenticator: TwitchAuthenticator, s: Settings
-):
- return GetTwitchAuthByAuthCodeSvc(s=s, authenticator=twitch_authenticator)
-
-
-async def get_create_chatbot_svc(chatbot_repo: ChatbotRepo):
- return CreateChatbotSvc(repo=chatbot_repo)
-
-
-async def get_user_repo(s: Settings):
- return UserRepo(s=s)
-
-
-async def get_create_user_svc(user_repo: UserRepo):
- return CreateUserSvc(user_repo=user_repo)
-
-
-async def get_update_user_svc(user_repo: UserRepo):
- return UpdateUserSvc(user_repo=user_repo)
-
-
-async def get_refresh_token_svc(twitch_authenticator: TwitchAuthenticator):
- return RefreshTokenSvc(twitch_authenticator=twitch_authenticator)
-
-
-async def get_is_valid_token_svc(twitch_authenticator: TwitchAuthenticator):
- return IsValidTokenSvc(authenticator=twitch_authenticator)
-
-
-async def get_get_user_by_username_svc(user_repo: UserRepo):
- return GetUserByUsernameSvc(user_repo=user_repo)
-
-
-async def get_get_user_by_jwt_action(
- get_user_by_username_svc: GetUserByUsernameSvc,
- update_user_svc: UpdateUserSvc,
- is_valid_token_svc: IsValidTokenSvc,
- refresh_token_svc: RefreshTokenSvc,
- s: Settings,
-):
- return GetUserByJWTAction(
- get_user_by_username_svc=get_user_by_username_svc,
- update_user_svc=update_user_svc,
- refresh_token_svc=refresh_token_svc,
- is_valid_token_svc=is_valid_token_svc,
- s=s,
- )
-
-
-async def authenticate(
- request: Request, get_user_by_jwt_action: GetUserByJWTAction
-) -> User:
- token = request.query_params.get("huesoporro_token")
- if token:
- user = await get_user_by_jwt_action.run(token)
- if not user:
- raise HTTPException(detail="User does not exist", status_code=404)
- return user
-
- cookies = request.cookies.get("huesoporroAuth")
- if cookies:
- user = await get_user_by_jwt_action.run(cookies)
- if not user:
- raise HTTPException(detail="User does not exist", status_code=404)
- return user
-
- raise HTTPException(status_code=401, detail="Unauthorized")
-
-
-async def get_sentences_storer_svc(db: MarkovDatabase):
- return SentenceStorerSvc(db=db)
-
-
-async def get_update_chatbot_svc(chatbot_repo: ChatbotRepo):
- return UpdateChatbotSvc(repo=chatbot_repo)
-
-
-async def get_create_or_update_chatbot_action(
- create_chatbot_svc: CreateChatbotSvc,
- update_chatbot_svc: UpdateChatbotSvc,
- get_chatbot_by_user_id_svc: GetChatbotByUserIdSvc,
-):
- return CreateOrUpdateChatbotAction(
- create_chatbot_svc=create_chatbot_svc,
- update_chatbot_svc=update_chatbot_svc,
- get_chatbot_by_user_id_svc=get_chatbot_by_user_id_svc,
- )
-
-
-async def get_get_chatbot_by_user_id_action(
- get_chatbot_by_user_id_svc: GetChatbotByUserIdSvc,
-):
- return GetChatbotByUserIdAction(
- get_chatbot_by_user_id_svc=get_chatbot_by_user_id_svc
- )
-
-
-async def get_authenticate_action(
- s: Settings,
- get_tokens_by_auth_code_svc: GetTwitchAuthByAuthCodeSvc,
- get_user_by_username_svc: GetUserByUsernameSvc,
- create_user_svc: CreateUserSvc,
- update_user_svc: UpdateUserSvc,
-):
- return AuthenticateUserAction(
- s=s,
- get_tokens_by_auth_code_svc=get_tokens_by_auth_code_svc,
- get_user_by_username_svc=get_user_by_username_svc,
- create_user_svc=create_user_svc,
- update_user_svc=update_user_svc,
- )
-
-
-async def get_bot_manager(s: Settings):
- return BotsManager(s=s)
-
-
-async def chatbot(
- get_chatbot_by_user_id_action: GetChatbotByUserIdAction,
- create_or_update_chatbot_action: CreateOrUpdateChatbotAction,
- user: User,
-) -> Chatbot:
- cb = await get_chatbot_by_user_id_action.run(user_id=user.id)
- if cb:
- return cb
- return await create_or_update_chatbot_action.run(
- user_id=user.id,
- )
diff --git a/src/apps/httpapi/litestar/main.py b/src/apps/httpapi/litestar/main.py
deleted file mode 100644
index 9854146..0000000
--- a/src/apps/httpapi/litestar/main.py
+++ /dev/null
@@ -1,122 +0,0 @@
-import httpx
-import uvicorn
-from litestar import Litestar, get
-from litestar.contrib.jinja import JinjaTemplateEngine
-from litestar.di import Provide
-from litestar.exceptions import HTTPException
-from litestar.static_files import StaticFilesConfig
-from litestar.template import TemplateConfig
-
-from apps.httpapi.litestar.dependencies import (
- authenticate,
- get_authenticate_action,
- get_authenticator,
- get_bot_manager,
- get_chatbot_repo,
- get_create_chatbot_svc,
- get_create_or_update_chatbot_action,
- get_create_user_svc,
- get_get_chatbot_by_user_id_action,
- get_get_chatbot_by_user_id_svc,
- get_get_tokens_by_auth_code_svc,
- get_get_user_by_jwt_action,
- get_get_user_by_username_svc,
- get_is_valid_token_svc,
- get_refresh_token_svc,
- get_sentences_storer_svc,
- get_settings,
- get_update_chatbot_svc,
- get_update_user_svc,
- get_user_repo,
-)
-from apps.httpapi.litestar.errors import (
- after_exception_handler,
- http_exception_handler,
- httpx_status_error_handler,
-)
-from apps.httpapi.litestar.routes.api import (
- get_bot_settings,
- get_bot_status,
- get_index,
- get_tts_overlay,
- get_tts_permalink,
- manage_bot,
- save_bot_settings,
-)
-from apps.httpapi.litestar.routes.auth import get_code, login
-from huesoporro.settings import Settings
-
-
-@get("/healthz")
-async def get_health() -> dict:
- return {"status": "ok"}
-
-
-def create_app():
- return Litestar(
- route_handlers=[
- get_health,
- login,
- get_index,
- get_tts_overlay,
- get_tts_permalink,
- get_code,
- manage_bot,
- get_bot_status,
- save_bot_settings,
- get_bot_settings,
- ],
- static_files_config=(
- StaticFilesConfig(
- path="/tts_files",
- directories=[Settings.get().tts_cache_path],
- ),
- StaticFilesConfig(
- path="static",
- directories=[Settings.get().static_files_path],
- ),
- ),
- template_config=TemplateConfig(
- directory=Settings.get().templates_files_path,
- engine=JinjaTemplateEngine,
- ),
- exception_handlers={
- HTTPException: http_exception_handler,
- httpx.HTTPStatusError: httpx_status_error_handler,
- },
- after_exception=[after_exception_handler],
- dependencies={
- "s": Provide(get_settings, use_cache=True),
- "a": Provide(get_authenticator, use_cache=True),
- "user": Provide(authenticate),
- "bm": Provide(get_bot_manager, use_cache=True),
- "sss": Provide(get_sentences_storer_svc),
- "twitch_authenticator": Provide(get_authenticator),
- "authenticate_action": Provide(get_authenticate_action),
- "user_repo": Provide(get_user_repo),
- "chatbot_repo": Provide(get_chatbot_repo),
- "create_user_svc": Provide(get_create_user_svc),
- "update_chatbot_svc": Provide(get_update_chatbot_svc),
- "update_user_svc": Provide(get_update_user_svc),
- "create_chatbot_svc": Provide(get_create_chatbot_svc),
- "refresh_token_svc": Provide(get_refresh_token_svc),
- "is_valid_token_svc": Provide(get_is_valid_token_svc),
- "get_user_by_username_svc": Provide(get_get_user_by_username_svc),
- "get_chatbot_by_user_id_svc": Provide(get_get_chatbot_by_user_id_svc),
- "get_tokens_by_auth_code_svc": Provide(get_get_tokens_by_auth_code_svc),
- "get_user_by_jwt_action": Provide(get_get_user_by_jwt_action),
- "get_chatbot_by_user_id_action": Provide(get_get_chatbot_by_user_id_action),
- "create_or_update_chatbot_action": Provide(
- get_create_or_update_chatbot_action
- ),
- },
- )
-
-
-app = create_app()
-
-if __name__ == "__main__":
- s = Settings.get()
- config = uvicorn.Config("main:app", host=s.host, port=s.port, log_level="info")
- server = uvicorn.Server(config)
- server.run()
diff --git a/src/apps/httpapi/litestar/routes/__init__.py b/src/apps/httpapi/litestar/routes/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/apps/httpapi/litestar/routes/api.py b/src/apps/httpapi/litestar/routes/api.py
deleted file mode 100644
index 5bedf86..0000000
--- a/src/apps/httpapi/litestar/routes/api.py
+++ /dev/null
@@ -1,120 +0,0 @@
-from typing import Literal
-
-from litestar import MediaType, Response, get, put
-from litestar.datastructures import UploadFile
-from litestar.response import Template
-from pydantic import BaseModel, ConfigDict
-
-from huesoporro.actions.chatbot.create_or_update_chatbot import (
- CreateOrUpdateChatbotAction,
-)
-from huesoporro.actions.chatbot.get_chatbot_by_user_id import GetChatbotByUserIdAction
-from huesoporro.bot import BotsManager
-from huesoporro.models import Chatbot, User
-
-
-class ManageBotDTO(BaseModel):
- command: Literal["start", "stop"]
- channel_name: str | None = None
-
-
-class ImportTextFileDTO(BaseModel):
- file: UploadFile
- channel_name: str
-
- model_config = ConfigDict(arbitrary_types_allowed=True)
-
-
-class UpdateChatbotDTO(BaseModel):
- automatic_generation_timer: int = 300
- automatic_quote_timer: int = 500
- mods: list[str]
-
-
-@get(
- "/tts",
- media_type=MediaType.HTML,
-)
-async def get_tts_overlay(user: User) -> Template:
- return Template(template_name="tts.html")
-
-
-@get(
- "/tts/permalink",
- media_type=MediaType.HTML,
-)
-async def get_tts_permalink(access_token: str) -> Template:
- """Handler for the /tts permalink endpoint to be used by apps that can only give the authentication as a query
- param and not as a cookie, i.e. OBS"""
-
- return Template(
- template_name="tts.html",
- )
-
-
-@get(
- "/",
- media_type=MediaType.HTML,
-)
-async def get_index(
- user: User, get_chatbot_by_user_id_action: GetChatbotByUserIdAction
-) -> Template:
- chatbot_settings = await get_chatbot_by_user_id_action.run(user_id=user.id)
- return Template(
- template_name="index.html",
- context=chatbot_settings.model_dump() if chatbot_settings else {},
- )
-
-
-@put("/api/v1/bot")
-async def manage_bot(
- user: User,
- data: ManageBotDTO,
- create_or_update_chatbot_action: CreateOrUpdateChatbotAction,
- get_chatbot_by_user_id_action: GetChatbotByUserIdAction,
- bm: BotsManager,
-) -> Response:
- chatbot = await get_chatbot_by_user_id_action.run(
- user_id=user.id
- ) or await create_or_update_chatbot_action.run(
- user_id=user.id,
- )
-
- if data.command == "start":
- if not data.channel_name:
- return Response({"message": "Channel name is required"}, status_code=400)
- bm.add_bot(user, data.channel_name, chatbot=chatbot) # type: ignore[arg-type]
- if user.username in bm.bots:
- await bm.run_user_bot(user)
- return Response({"message": "Bot started"})
- if data.command == "stop" and user.username in bm.bots:
- await bm.stop_user_bot(user)
- return Response({"message": "Bot stopped"})
- return Response({"message": "Invalid command"}, status_code=400)
-
-
-@get("/api/v1/bot")
-async def get_bot_status(user: User, bm: BotsManager) -> dict:
- if user.username not in bm.bots:
- return {"status": "ko"}
- return {"status": "ok"}
-
-
-@get("/api/v1/bot/settings")
-async def get_bot_settings(chatbot: Chatbot) -> Chatbot:
- return chatbot
-
-
-@put("/api/v1/bot/settings")
-async def save_bot_settings(
- user: User,
- data: UpdateChatbotDTO,
- create_or_update_chatbot_action: CreateOrUpdateChatbotAction,
-) -> dict:
- await create_or_update_chatbot_action.run(
- user_id=user.id,
- automatic_generation_timer=data.automatic_generation_timer,
- automatic_quote_timer=data.automatic_quote_timer,
- mods=data.mods,
- )
- return {"status": "ok"}
diff --git a/src/huesoporro/actions/chatbot/__init__.py b/src/huesoporro/actions/chatbot/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/huesoporro/actions/chatbot/create_or_update_chatbot.py b/src/huesoporro/actions/chatbot/create_or_update_chatbot.py
deleted file mode 100644
index 73d0df8..0000000
--- a/src/huesoporro/actions/chatbot/create_or_update_chatbot.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import uuid
-from uuid import UUID
-
-from pydantic import BaseModel
-
-from huesoporro.models import Chatbot
-from huesoporro.svc.chatbot_svcs import (
- CreateChatbotSvc,
- GetChatbotByUserIdSvc,
- UpdateChatbotSvc,
-)
-
-
-class CreateOrUpdateChatbotAction(BaseModel):
- create_chatbot_svc: CreateChatbotSvc
- update_chatbot_svc: UpdateChatbotSvc
- get_chatbot_by_user_id_svc: GetChatbotByUserIdSvc
-
- async def run(
- self,
- user_id: UUID,
- automatic_generation_timer: int = 300,
- automatic_quote_timer: int = 500,
- mods: list[str] | None = None,
- ) -> Chatbot:
- mods = mods or []
- chatbot = await self.get_chatbot_by_user_id_svc.run(user_id=user_id)
- if chatbot:
- chatbot.automatic_generation_timer = automatic_generation_timer
- chatbot.automatic_quote_timer = automatic_quote_timer
- chatbot.mods = mods
- return await self.update_chatbot_svc.run(chatbot=chatbot)
- chatbot = Chatbot(
- id=uuid.uuid4(),
- user_id=user_id,
- automatic_generation_timer=automatic_generation_timer,
- automatic_quote_timer=automatic_quote_timer,
- mods=mods,
- )
- return await self.create_chatbot_svc.run(chatbot=chatbot)
diff --git a/src/huesoporro/actions/chatbot/get_chatbot_by_user_id.py b/src/huesoporro/actions/chatbot/get_chatbot_by_user_id.py
deleted file mode 100644
index 5d45a5e..0000000
--- a/src/huesoporro/actions/chatbot/get_chatbot_by_user_id.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from uuid import UUID
-
-from pydantic import BaseModel
-
-from huesoporro.models import Chatbot
-from huesoporro.svc.chatbot_svcs import GetChatbotByUserIdSvc
-
-
-class GetChatbotByUserIdAction(BaseModel):
- get_chatbot_by_user_id_svc: GetChatbotByUserIdSvc
-
- async def run(
- self,
- user_id: UUID,
- ) -> Chatbot | None:
- return await self.get_chatbot_by_user_id_svc.run(user_id=user_id)
diff --git a/src/huesoporro/actions/import_from_vod.py b/src/huesoporro/actions/import_from_vod.py
deleted file mode 100644
index be62ea5..0000000
--- a/src/huesoporro/actions/import_from_vod.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from collections.abc import Generator
-from pathlib import Path
-
-from pydantic import BaseModel, Field
-
-from huesoporro.libs.db import MarkovDatabase
-from huesoporro.settings import Settings
-from huesoporro.svc.clean_cc_svc import CleanCCSvc
-from huesoporro.svc.download_closed_captions import DownloadClosedCaptionsSvc
-from huesoporro.svc.store import SentenceStorerSvc
-
-
-class ImportFromVODAction(BaseModel):
- download_closed_captions_svc: DownloadClosedCaptionsSvc
-
- clean_cc_svc: CleanCCSvc
- s: Settings = Field(default_factory=Settings.get)
-
- ignore_lines: set[str] = {
- "WEBVTT",
- "Kind: captions",
- "Language: en",
- "Language: es",
- }
-
- def run(self, channel_name: str, youtube_url: str) -> Generator[Path, None, None]:
- for cc_filepath in self.download_closed_captions_svc.run(youtube_url):
- storer_svc = SentenceStorerSvc(
- db=MarkovDatabase(channel=channel_name, settings=self.s)
- )
- for line in self.clean_cc_svc.run(cc_filepath):
- if line and line not in self.ignore_lines:
- storer_svc.store_sentence(line.strip())
- yield cc_filepath
diff --git a/src/huesoporro/actions/misc/__init__.py b/src/huesoporro/actions/misc/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/huesoporro/actions/misc/update_version_action.py b/src/huesoporro/actions/misc/update_version_action.py
deleted file mode 100644
index cd2206c..0000000
--- a/src/huesoporro/actions/misc/update_version_action.py
+++ /dev/null
@@ -1,198 +0,0 @@
-import re
-from collections.abc import Callable
-from difflib import unified_diff
-from pathlib import Path
-
-import yaml
-from loguru import logger
-from pydantic import BaseModel, ConfigDict
-from rich import print # noqa: A004
-from rich.console import Console
-from rich.panel import Panel
-from rich.syntax import Syntax
-
-
-class UpdateVersionAction(BaseModel):
- project_root: Path = Path(__file__).parents[4]
- files_to_update: dict[str, Callable]
- console: Console = Console()
-
- model_config = ConfigDict(arbitrary_types_allowed=True)
-
- def __init__(self, **data):
- files_to_update = {
- "pyproject.toml": self._update_pyproject_toml,
- "charts/huesoporro/values.yaml": self._update_values_yaml,
- "charts/huesoporro/Chart.yaml": self._update_chart_yaml,
- }
- super().__init__(**data, files_to_update=files_to_update)
-
- def _read_file(self, filepath: Path) -> str:
- """
- Read the contents of a file.
-
- Args:
- filepath (Path): Path to the file to read.
-
- Returns:
- str: File contents
- """
- with filepath.open("r") as f:
- return f.read()
-
- def _write_file(self, filepath: Path, content: str):
- """
- Write content to a file.
-
- Args:
- filepath (Path): Path to the file to write.
- content (str): Content to write to the file.
- """
- with filepath.open("w") as f:
- f.write(content)
-
- def _update_pyproject_toml(self, filepath: Path, new_version: str) -> str:
- """
- Update version in pyproject.toml.
-
- Args:
- filepath (Path): Path to pyproject.toml
- new_version (str): New version to set
-
- Returns:
- str: Updated file content
- """
- content = self._read_file(filepath)
- version_pattern = r'(version\s*=\s*)[\'"](.+?)[\'"]'
- return re.sub(version_pattern, rf'\1"{new_version}"', content)
-
- def _update_values_yaml(self, filepath: Path, new_version: str) -> str:
- """
- Update image tag in values.yaml.
-
- Args:
- filepath (Path): Path to values.yaml
- new_version (str): New version to set
-
- Returns:
- str: Updated file content
- """
- with filepath.open("r") as file:
- values = yaml.safe_load(file)
-
- # Assumes image.tag exists in the values.yaml
- values["image"]["tag"] = new_version
-
- return yaml.dump(values, default_flow_style=False)
-
- def _update_chart_yaml(self, filepath: Path, new_version: str) -> str:
- """
- Update version and appVersion in Chart.yaml.
-
- Args:
- filepath (Path): Path to Chart.yaml
- new_version (str): New version to set
-
- Returns:
- str: Updated file content
- """
- with filepath.open("r") as file:
- chart_data = yaml.safe_load(file)
-
- chart_data["version"] = new_version
- chart_data["appVersion"] = new_version
-
- return yaml.dump(chart_data, default_flow_style=False)
-
- def _generate_diff(self, original: str, updated: str, filename: str) -> str:
- """
- Generate a unified diff between original and updated content.
-
- Args:
- original (str): Original file content
- updated (str): Updated file content
- filename (str): Name of the file
-
- Returns:
- str: Unified diff representation
- """
- # Split content into lines
- original_lines = original.splitlines(keepends=True)
- updated_lines = updated.splitlines(keepends=True)
-
- # Generate unified diff
- diff_lines = list(
- unified_diff(
- original_lines,
- updated_lines,
- fromfile=f"a/{filename}",
- tofile=f"b/{filename}",
- lineterm="",
- )
- )
-
- return "\n".join(diff_lines)
-
- def _rich_display_diff(self, diff: str):
- """
- Display diff using rich for colorful output.
-
- Args:
- diff (str): Unified diff to display
- """
- if not diff:
- return
-
- # Use Syntax for syntax highlighting
- syntax = Syntax(diff, "diff", theme="ansi_dark")
-
- # Create a panel with the diff
- panel = Panel(
- syntax, title="Version Update Diff", border_style="cyan", expand=False
- )
-
- # Display the panel
- self.console.print(panel)
-
- def run(self, new_version: str, dry_run: bool = False):
- """
- Update version across all specified files.
-
- Args:
- new_version (str): New version to set
- dry_run (bool): Dry run mode with diff display
- """
- for relative_path, update_func in self.files_to_update.items():
- filepath = self.project_root / relative_path
-
- if not filepath.exists():
- logger.warning(f"Warning: {filepath} not found. Skipping.")
- continue
-
- try:
- # Read original content
- original_content = self._read_file(filepath)
-
- # Generate updated content
- updated_content = update_func(filepath, new_version)
-
- if dry_run:
- # Generate and display diff
- diff = self._generate_diff(
- original_content, updated_content, str(relative_path)
- )
-
- # Display the diff
- if diff:
- print(f"\nDiff for {relative_path}:")
- self._rich_display_diff(diff)
- else:
- # Write updated content
- self._write_file(filepath, updated_content)
- print(f"Updated {relative_path}")
-
- except Exception as exc: # noqa: BLE001
- logger.error(f"Error updating {relative_path}: {exc}")
-
- if dry_run:
- print("\nDry run complete. No files were modified.")
diff --git a/src/huesoporro/actions/quotes/__init__.py b/src/huesoporro/actions/quotes/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/huesoporro/actions/quotes/create_quote_action.py b/src/huesoporro/actions/quotes/create_quote_action.py
deleted file mode 100644
index 2e5fcca..0000000
--- a/src/huesoporro/actions/quotes/create_quote_action.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import datetime
-import uuid
-
-from pydantic import BaseModel
-
-from huesoporro.models import Quote, User
-from huesoporro.svc.is_mod import IsModSvc
-from huesoporro.svc.quotes_svcs import CreateQuoteSvc
-
-
-class CreateQuoteAction(BaseModel):
- create_quote_svc: CreateQuoteSvc
- is_mod_svc: IsModSvc
-
- async def run( # noqa: PLR0913
- self,
- user: User,
- channel: str,
- quote: str,
- author: str,
- username: str,
- is_active: bool = True,
- ) -> Quote | None:
- if not await self.is_mod_svc.run(user=user, username=username, channel=channel):
- return None
- new_quote = Quote(
- id=uuid.uuid4(),
- quote=quote,
- author=author,
- channel_name=channel,
- created_at=datetime.datetime.now(datetime.UTC),
- is_active=is_active,
- last_updated_at=datetime.datetime.now(datetime.UTC),
- )
- return await self.create_quote_svc.run(new_quote)
diff --git a/src/huesoporro/actions/quotes/get_random_quote.py b/src/huesoporro/actions/quotes/get_random_quote.py
deleted file mode 100644
index 67f60c6..0000000
--- a/src/huesoporro/actions/quotes/get_random_quote.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from pydantic import BaseModel
-
-from huesoporro.models import Quote
-from huesoporro.svc.quotes_svcs import GetRandomQuoteSvc
-
-
-class GetRandomQuoteAction(BaseModel):
- get_random_quote_svc: GetRandomQuoteSvc
-
- async def run(self, channel_name: str) -> Quote | None:
- return await self.get_random_quote_svc.run(channel_name=channel_name)
diff --git a/src/huesoporro/actions/store_quote.py b/src/huesoporro/actions/store_quote.py
new file mode 100644
index 0000000..719c776
--- /dev/null
+++ b/src/huesoporro/actions/store_quote.py
@@ -0,0 +1,18 @@
+from pydantic import BaseModel
+
+from src.huesoporro.models import User
+from src.huesoporro.svc.is_mod import IsModSvc
+from src.huesoporro.svc.store_quote import QuoteStorerSvc
+
+
+class StoreQuoteAction(BaseModel):
+ quote_storer_svc: QuoteStorerSvc
+ is_mod_svc: IsModSvc
+
+ async def run(
+ self, user: User, channel: str, quote: str, author: str, username: str
+ ) -> str:
+ if not await self.is_mod_svc.run(user=user, username=username):
+ return f"{username} is not a mod and cannot add quotes. Only moderators can add quotes. Sorry!"
+ await self.quote_storer_svc.run(channel, quote, author)
+ return f"ยซ{quote}ยป added by {author}."
diff --git a/src/huesoporro/actions/users/__init__.py b/src/huesoporro/actions/users/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/huesoporro/actions/users/authenticate_user.py b/src/huesoporro/actions/users/authenticate_user.py
deleted file mode 100644
index 0b19904..0000000
--- a/src/huesoporro/actions/users/authenticate_user.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import uuid
-
-from pydantic import BaseModel
-
-from huesoporro.models import User
-from huesoporro.settings import Settings
-from huesoporro.svc.users_svcs import (
- CreateUserSvc,
- GetTwitchAuthByAuthCodeSvc,
- GetUserByUsernameSvc,
- UpdateUserSvc,
-)
-
-
-class AuthenticateUserAction(BaseModel):
- get_tokens_by_auth_code_svc: GetTwitchAuthByAuthCodeSvc
- get_user_by_username_svc: GetUserByUsernameSvc
- create_user_svc: CreateUserSvc
- update_user_svc: UpdateUserSvc
- s: Settings
-
- async def run(
- self,
- auth_code: str,
- ) -> User:
- auth = await self.get_tokens_by_auth_code_svc.run(auth_code=auth_code)
- username = auth.userinfo["preferred_username"]
- user = await self.get_user_by_username_svc.run(username=username)
- if user:
- user.external_auth = {"twitch": auth}
- await self.update_user_svc.run(user)
- return user
- user = User(
- id=uuid.uuid4(),
- username=username,
- external_auth={"twitch": auth},
- )
- return await self.create_user_svc.run(user=user)
diff --git a/src/huesoporro/actions/users/get_user_by_jwt.py b/src/huesoporro/actions/users/get_user_by_jwt.py
deleted file mode 100644
index c1a7a75..0000000
--- a/src/huesoporro/actions/users/get_user_by_jwt.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from loguru import logger
-from pydantic import BaseModel
-
-from huesoporro.models import User
-from huesoporro.settings import Settings
-from huesoporro.svc.users_svcs import (
- GetUserByUsernameSvc,
- IsValidTokenSvc,
- RefreshTokenSvc,
- UpdateUserSvc,
-)
-
-
-class GetUserByJWTAction(BaseModel):
- get_user_by_username_svc: GetUserByUsernameSvc
- update_user_svc: UpdateUserSvc
- refresh_token_svc: RefreshTokenSvc
- is_valid_token_svc: IsValidTokenSvc
- s: Settings
-
- async def run(
- self,
- jwt_token: str,
- ) -> User | None:
- user_data = User.decode(jwt_token, settings=self.s)
- username = user_data["username"]
- user = await self.get_user_by_username_svc.run(username=username)
- if not user:
- raise ValueError(f"User {username} not found")
- if await self.is_valid_token_svc.run(user=user):
- logger.info(
- f"User {username} has a correct twitch authentication token, returning user"
- )
- return user
-
- logger.info(
- f"User {username} has an invalid twitch authentication token, refreshing it"
- )
- user = await self.refresh_token_svc.run(user=user)
- return await self.update_user_svc.run(user=user)
diff --git a/src/huesoporro/actions/users/refresh_user_jwt.py b/src/huesoporro/actions/users/refresh_user_jwt.py
deleted file mode 100644
index c4cc4da..0000000
--- a/src/huesoporro/actions/users/refresh_user_jwt.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from pydantic import BaseModel
-
-from huesoporro.models import User
-from huesoporro.settings import Settings
-from huesoporro.svc.users_svcs import (
- GetUserByUsernameSvc,
- IsValidTokenSvc,
- RefreshTokenSvc,
- UpdateUserSvc,
-)
-
-
-class RefreshUserJwtAction(BaseModel):
- get_user_by_username_svc: GetUserByUsernameSvc
- update_user_svc: UpdateUserSvc
- refresh_token_svc: RefreshTokenSvc
- is_valid_token_svc: IsValidTokenSvc
- s: Settings
-
- async def run(self, user: User) -> User | None:
- """Return None if the user has a valid token, otherwise refresh it and return the new token"""
- if await self.is_valid_token_svc.run(user=user):
- return None
-
- user = await self.refresh_token_svc.run(user=user)
- return await self.update_user_svc.run(user=user)
diff --git a/src/apps/cli/__init__.py b/src/huesoporro/api/__init__.py
similarity index 100%
rename from src/apps/cli/__init__.py
rename to src/huesoporro/api/__init__.py
diff --git a/src/huesoporro/api/dependencies.py b/src/huesoporro/api/dependencies.py
new file mode 100644
index 0000000..5db8371
--- /dev/null
+++ b/src/huesoporro/api/dependencies.py
@@ -0,0 +1,48 @@
+from litestar import Request
+from litestar.exceptions import HTTPException
+
+from src.huesoporro.infra.authenticator import TwitchAuthenticator
+from src.huesoporro.infra.db import Database
+from src.huesoporro.models import User
+from src.huesoporro.settings import Settings
+from src.huesoporro.svc.authenticate import CodeAuthenticatorSvc
+from src.huesoporro.svc.get_chatbot_settings import ChatbotSettingsGetterSvc
+from src.huesoporro.svc.store_settings import ChatbotSettingsStorerSvc
+
+
+def get_settings() -> Settings:
+ return Settings.get()
+
+
+def get_authenticator(s: Settings) -> TwitchAuthenticator:
+ return TwitchAuthenticator(s=s)
+
+
+def get_db(s: Settings):
+ return Database(s=s)
+
+
+async def authenticate(request: Request) -> User:
+ token = request.query_params.get("huesoporro_token")
+ if token:
+ return User.decode(token)
+
+ cookies = request.cookies.get("huesoporroAuth")
+ if cookies:
+ return User.decode(cookies)
+
+ raise HTTPException(status_code=401, detail="Unauthorized")
+
+
+async def get_code_authenticator_svc(
+ a: TwitchAuthenticator, db: Database
+) -> CodeAuthenticatorSvc:
+ return CodeAuthenticatorSvc(authenticator=a, db=db)
+
+
+async def get_chatbot_settings_svc(db: Database):
+ return ChatbotSettingsGetterSvc(db=db)
+
+
+async def store_chatbot_settings_svc(db: Database):
+ return ChatbotSettingsStorerSvc(db=db)
diff --git a/src/apps/httpapi/litestar/errors.py b/src/huesoporro/api/errors.py
similarity index 96%
rename from src/apps/httpapi/litestar/errors.py
rename to src/huesoporro/api/errors.py
index 19426df..f530ae3 100644
--- a/src/apps/httpapi/litestar/errors.py
+++ b/src/huesoporro/api/errors.py
@@ -30,7 +30,7 @@ def httpx_status_error_handler(_: Request, exc: httpx.HTTPStatusError):
)
-async def after_exception_handler(exc: Exception, scope: "Scope") -> None: # type: ignore[name-defined] # noqa: F821
+async def after_exception_handler(exc: Exception, scope: "Scope") -> None:
"""Hook function that will be invoked after each exception."""
state = scope["app"].state
if not hasattr(state, "error_count"):
diff --git a/src/huesoporro/api/main.py b/src/huesoporro/api/main.py
new file mode 100644
index 0000000..07dba33
--- /dev/null
+++ b/src/huesoporro/api/main.py
@@ -0,0 +1,85 @@
+import httpx
+from litestar import Litestar, get
+from litestar.contrib.jinja import JinjaTemplateEngine
+from litestar.di import Provide
+from litestar.exceptions import HTTPException
+from litestar.static_files import StaticFilesConfig
+from litestar.template import TemplateConfig
+
+from src.huesoporro.api.dependencies import (
+ authenticate,
+ get_authenticator,
+ get_chatbot_settings_svc,
+ get_code_authenticator_svc,
+ get_db,
+ get_settings,
+ store_chatbot_settings_svc,
+)
+from src.huesoporro.api.errors import (
+ after_exception_handler,
+ http_exception_handler,
+ httpx_status_error_handler,
+)
+from src.huesoporro.api.routes.api import (
+ get_bot_settings,
+ get_bot_status,
+ get_index,
+ get_tts_overlay,
+ get_tts_permalink,
+ manage_bot,
+ save_bot_settings,
+)
+from src.huesoporro.api.routes.auth import get_code, login
+from src.huesoporro.bot import BotsManager
+from src.huesoporro.settings import Settings
+
+
+@get("/healthz")
+def get_health() -> dict:
+ return {"status": "ok"}
+
+
+def create_app():
+ return Litestar(
+ route_handlers=[
+ get_health,
+ login,
+ get_index,
+ get_tts_overlay,
+ get_tts_permalink,
+ get_code,
+ manage_bot,
+ get_bot_status,
+ save_bot_settings,
+ get_bot_settings,
+ ],
+ static_files_config=(
+ StaticFilesConfig(
+ path="/tts_files",
+ directories=[Settings.get().tts_cache_path],
+ ),
+ StaticFilesConfig(
+ path="static",
+ directories=[Settings.get().static_files_path],
+ ),
+ ),
+ template_config=TemplateConfig(
+ directory=Settings.get().templates_files_path,
+ engine=JinjaTemplateEngine,
+ ),
+ exception_handlers={
+ HTTPException: http_exception_handler,
+ httpx.HTTPStatusError: httpx_status_error_handler,
+ },
+ after_exception=[after_exception_handler],
+ dependencies={
+ "s": Provide(get_settings, use_cache=True),
+ "a": Provide(get_authenticator, use_cache=True),
+ "user": Provide(authenticate),
+ "db": Provide(get_db, use_cache=True),
+ "code_authenticator_svc": Provide(get_code_authenticator_svc),
+ "bm": Provide(BotsManager, use_cache=True),
+ "gbs": Provide(get_chatbot_settings_svc),
+ "sbs": Provide(store_chatbot_settings_svc),
+ },
+ )
diff --git a/src/apps/cli/typer/__init__.py b/src/huesoporro/api/routes/__init__.py
similarity index 100%
rename from src/apps/cli/typer/__init__.py
rename to src/huesoporro/api/routes/__init__.py
diff --git a/src/huesoporro/api/routes/api.py b/src/huesoporro/api/routes/api.py
new file mode 100644
index 0000000..9161f28
--- /dev/null
+++ b/src/huesoporro/api/routes/api.py
@@ -0,0 +1,86 @@
+from typing import Literal
+
+from litestar import MediaType, Response, get, put
+from litestar.response import Template
+from pydantic import BaseModel
+
+from src.huesoporro.bot import BotsManager
+from src.huesoporro.models import ChatbotSettings, User
+from src.huesoporro.svc.get_chatbot_settings import ChatbotSettingsGetterSvc
+from src.huesoporro.svc.store_settings import ChatbotSettingsStorerSvc
+
+
+class ManageBotDTO(BaseModel):
+ command: Literal["start", "stop"]
+ channel_name: str | None = None
+
+
+@get(
+ "/tts",
+ media_type=MediaType.HTML,
+)
+async def get_tts_overlay() -> Template:
+ return Template(template_name="tts.html")
+
+
+@get(
+ "/tts/permalink",
+ media_type=MediaType.HTML,
+)
+async def get_tts_permalink(access_token: str) -> Template:
+ """Handler for the /tts permalink endpoint to be used by apps that can only give the authentication as a query
+ param and not as a cookie, i.e. OBS"""
+
+ # authenticate the user using the provided access token
+
+ return Template(
+ template_name="tts.html",
+ )
+
+
+@get(
+ "/",
+ media_type=MediaType.HTML,
+)
+async def get_index(user: User, gbs: ChatbotSettingsGetterSvc) -> Template:
+ chatbot_settings = await gbs.run(user=user)
+ return Template(template_name="index.html", context=chatbot_settings.model_dump() if chatbot_settings else {})
+
+
+@put("/api/v1/bot")
+async def manage_bot(
+ user: User, data: ManageBotDTO, gbs: ChatbotSettingsGetterSvc, bm: BotsManager
+) -> Response:
+ chatbot_settings = await gbs.run(user=user)
+ if data.command == "start":
+ if not data.channel_name:
+ return Response({"message": "Channel name is required"}, status_code=400)
+ bm.add_bot(user, data.channel_name, chatbot_settings=chatbot_settings)
+ if user.user in bm.bots:
+ await bm.run_user_bot(user)
+ return Response({"message": "Bot started"})
+ if data.command == "stop" and user.user in bm.bots:
+ await bm.stop_user_bot(user)
+ return Response({"message": "Bot stopped"})
+
+
+@get("/api/v1/bot")
+async def get_bot_status(user: User, bm: BotsManager) -> dict:
+ if user.user not in bm.bots:
+ return {"status": "ko"}
+ return {"status": "ok"}
+
+
+@get("/api/v1/bot/settings")
+async def get_bot_settings(
+ user: User, gbs: ChatbotSettingsGetterSvc
+) -> ChatbotSettings:
+ return await gbs.run(user=user)
+
+
+@put("/api/v1/bot/settings")
+async def save_bot_settings(
+ user: User, data: ChatbotSettings, sbs: ChatbotSettingsStorerSvc
+) -> dict:
+ await sbs.run(user=user, bot_settings=data)
+ return {"status": "ok"}
diff --git a/src/apps/httpapi/litestar/routes/auth.py b/src/huesoporro/api/routes/auth.py
similarity index 53%
rename from src/apps/httpapi/litestar/routes/auth.py
rename to src/huesoporro/api/routes/auth.py
index 446e7e3..2f1c287 100644
--- a/src/apps/httpapi/litestar/routes/auth.py
+++ b/src/huesoporro/api/routes/auth.py
@@ -1,27 +1,16 @@
import secrets
from litestar import MediaType, get
-from litestar.datastructures.cookie import Cookie
from litestar.response import Redirect, Template
-from huesoporro.actions.users.authenticate_user import AuthenticateUserAction
-from huesoporro.settings import Settings
+from src.huesoporro.settings import Settings
+from src.huesoporro.svc.authenticate import CodeAuthenticatorSvc
@get(path="/o/code")
-async def get_code(code: str, authenticate_action: AuthenticateUserAction) -> Redirect:
- user = await authenticate_action.run(code)
- token = user.encode()
- return Redirect(
- "/",
- cookies=[
- Cookie(
- key="huesoporroAuth",
- value=token,
- expires=604800, # 1 week
- )
- ],
- )
+async def get_code(code: str, code_authenticator_svc: CodeAuthenticatorSvc) -> Redirect:
+ user = await code_authenticator_svc.run(code)
+ return Redirect("/", cookies={"huesoporroAuth": user.encode()})
@get(
diff --git a/src/huesoporro/bot.py b/src/huesoporro/bot.py
index abd5d28..a842586 100644
--- a/src/huesoporro/bot.py
+++ b/src/huesoporro/bot.py
@@ -1,110 +1,86 @@
import asyncio
-import random
-from collections.abc import Callable
-from enum import StrEnum
-from typing import ClassVar
from loguru import logger
-from tenacity import (
- retry,
- retry_if_exception_type,
- stop_after_attempt,
- wait_exponential,
-)
-from twitchio import Channel, Message
+from twitchio import Channel
from twitchio.ext import commands, routines
-from huesoporro.actions.quotes.create_quote_action import CreateQuoteAction
-from huesoporro.actions.quotes.get_random_quote import GetRandomQuoteAction
-from huesoporro.infra.repos import ChatbotRepo, QuoteRepo
-from huesoporro.libs.db import MarkovDatabase
-from huesoporro.models import Chatbot, User
-from huesoporro.settings import Settings
-from huesoporro.svc.backoff_service import BackoffService
-from huesoporro.svc.generate import SentenceGeneratorSvc
-from huesoporro.svc.hello import get_hello_generator_svc
-from huesoporro.svc.is_mod import IsModSvc
-from huesoporro.svc.quotes_svcs import CreateQuoteSvc, GetRandomQuoteSvc
-from huesoporro.svc.store import SentenceStorerSvc
+from src.huesoporro.actions.store_quote import StoreQuoteAction
+from src.huesoporro.infra.db import Database
+from src.huesoporro.libs.db import Database as MarkovDB
+from src.huesoporro.models import ChatbotSettings, User
+from src.huesoporro.svc.generate import SentenceGeneratorSvc
+from src.huesoporro.svc.get_random_quote import RandomQuoteGetterSvc
+from src.huesoporro.svc.hello import HelloGeneratorSvc
+from src.huesoporro.svc.is_mod import IsModSvc
+from src.huesoporro.svc.store import SentenceStorerSvc
+from src.huesoporro.svc.store_quote import QuoteStorerSvc
class Bot(commands.Bot):
- def __init__dependencies(self, channel: str, settings: Settings):
- self.quote_repo = QuoteRepo(s=settings)
- self.chatbot_repo = ChatbotRepo(s=settings)
- self.get_random_quote_action = GetRandomQuoteAction(
- get_random_quote_svc=GetRandomQuoteSvc(repo=self.quote_repo)
- )
- self.create_quote_action = CreateQuoteAction(
- create_quote_svc=CreateQuoteSvc(repo=self.quote_repo),
- is_mod_svc=IsModSvc(repo=self.chatbot_repo),
- )
- self.generate_svc = SentenceGeneratorSvc(db=MarkovDatabase(channel=channel))
- self.hello_svc = get_hello_generator_svc()
-
- def __init__(self, user: User, chatbot: Chatbot, channel: str, settings: Settings):
+ def __init__(self, user: User, chatbot_settings: ChatbotSettings, channel: str):
super().__init__(
- token=user.twitch_access_token, prefix="!", initial_channels=[channel]
+ token=user.twitch_auth.access_token, prefix="!", initial_channels=[channel]
)
- self.__init__dependencies(channel=channel, settings=settings)
self.channel = channel
self.user = user
- self.chatbot = chatbot
+ self.generate_svc = SentenceGeneratorSvc(db=MarkovDB(channel=channel))
+ self.hello_svc = HelloGeneratorSvc()
+ db = Database()
+ self.store_quote_action = StoreQuoteAction(
+ quote_storer_svc=QuoteStorerSvc(db=db), is_mod_svc=IsModSvc(db=db)
+ )
+
+ self.get_random_quote_svc = RandomQuoteGetterSvc(db=db)
+
self.quote_routine = routines.routine(
- seconds=chatbot.automatic_quote_timer, wait_first=True
+ seconds=chatbot_settings.automatic_quote_timer, wait_first=True
)(self.send_quote)
self.generation_routine = routines.routine(
- seconds=chatbot.automatic_generation_timer, wait_first=True
+ seconds=chatbot_settings.automatic_generation_timer, wait_first=True
)(self.send_generation)
async def event_ready(self):
logger.info(f"Logged in as {self.nick}")
logger.info(f"User id is {self.user_id}")
+ @commands.command()
+ async def hello(self, ctx: commands.Context, user: User | None = None):
+ username = user.name if user else ctx.author.name
+ await ctx.send(self.hello_svc.run(username))
+
@commands.command(aliases=["g"])
async def generate(self, ctx: commands.Context, *, words: str | None = None):
sentence = await self.generate_svc.run(words)
- if not sentence:
- logger.warning(
- f"Could not generate sentence for {words or 'no words provided'}"
- )
- return
- await ctx.send(sentence)
- # Wait for the specified time
- await asyncio.sleep(60)
+ if sentence:
+ await ctx.send(sentence)
@commands.command(aliases=["qadd"])
async def add_quote(self, ctx: commands.Context, *, quote: str):
# extract author from quote; the author is the last word
quote, author = quote.rsplit(" ", 1)
- new_quote = await self.create_quote_action.run(
- user=self.user,
- channel=self.channel,
- quote=quote,
- author=author,
- username=ctx.author.name,
+ await ctx.send(
+ await self.store_quote_action.run(
+ user=self.user,
+ channel=self.channel,
+ quote=quote,
+ author=author,
+ username=ctx.author.name,
+ )
)
- if new_quote:
- await ctx.send(new_quote.as_pretty_saved())
- else:
- await ctx.send(f"@{ctx.author.name} no tienes permisos para aรฑadir citas")
@commands.command(aliases=["q", "quote"])
async def get_random_quote(self, ctx: commands.Context):
- quote = await self.get_random_quote_action.run(channel_name=self.channel)
- if quote:
- await ctx.send(quote.as_pretty())
+ quote = await self.get_random_quote_svc.run(channel_name=self.channel)
+ await ctx.send(f"ยซ{quote[0]}ยป - {quote[1]}")
def get_channel_conn(self) -> Channel:
return Channel(name=self.channel, websocket=self._connection)
async def send_quote(self):
- quote = await self.get_random_quote_action.run(channel_name=self.channel)
- if quote:
- channel = self.get_channel_conn()
- if channel:
- logger.info(f"Sending random quote {quote.quote}")
- await channel.send(quote.quote)
+ quote = await self.get_random_quote_svc.run(channel_name=self.channel)
+ channel = self.get_channel_conn()
+ logger.info(f"Sending random quote {quote[0]}")
+ await channel.send(f"ยซ{quote[0]}ยป - {quote[1]}")
async def send_generation(self):
sentence = await self.generate_svc.run()
@@ -115,12 +91,9 @@ class Bot(commands.Bot):
await channel.send(sentence)
def start_routines(self):
- if self.chatbot.automatic_quote_timer > 0:
- logger.info("Starting quote routine")
- self.quote_routine.start(stop_on_error=False)
- if self.chatbot.automatic_generation_timer > 0:
- logger.info("Starting generation routine")
- self.generation_routine.start(stop_on_error=False)
+ logger.info("Starting routines")
+ self.quote_routine.start(stop_on_error=False)
+ self.generation_routine.start(stop_on_error=False)
def stop_routines(self):
logger.info("Stopping routines")
@@ -128,253 +101,50 @@ class Bot(commands.Bot):
self.generation_routine.cancel()
-class HelloMessagesCog(commands.Cog):
- hello_patterns: ClassVar[list[str]] = ["hola", "HOLA", "hiii", "ayo"]
-
+class SaveMessagesCog(commands.Cog):
def __init__(self, bot):
self.bot = bot
- self.hello_svc = get_hello_generator_svc()
+ self.store_svc = SentenceStorerSvc(db=MarkovDB(channel=bot.channel))
@commands.Cog.event()
async def event_message(self, message):
- if not message.author:
- return
- if message.content in self.hello_patterns:
- hello = self.hello_svc.run(message.author.name)
- if hello:
- await message.channel.send(hello)
-
-
-class MessageType(StrEnum):
- COMMAND = "COMMAND"
- HELLO = "HELLO"
- YES = "YES"
- WHAT = "WHAT"
- LAUGH = "LAUGH"
- ANO_SUFFIX = "ANO_SUFFIX"
- OTHER = "OTHER"
-
-
-class MessageHandler:
- """Handles different types of messages with their corresponding responses"""
-
- def __init__(self, channel_send_func: Callable):
- self.laugh_patterns = [
- "om",
- "KEK",
- "LuL",
- "LUL",
- "OMEGALUL",
- "kek",
- "keking",
- "KEKW",
- "OMEGADANCEBUTFAST",
- "xdd",
- "xdding",
- ]
- self.ano_suffix_reply_patterns = [
- "me la agarras con la mano. venga, tira",
- "me la agarras con la mano, espabila",
- "me la agarras con la mano y te falta calle",
- "vegetasmile",
- ]
- self.send = channel_send_func
-
- def get_message_type(self, content: str) -> MessageType:
- """Determines the type of message based on its content"""
+ # An event inside a cog!
+ content = message.content
if content.startswith("!"):
- return MessageType.COMMAND
- if content in ["Yes", "yes"]:
- return MessageType.YES
- if content.startswith("WHAT"):
- return MessageType.WHAT
- if content.endswith("ano") and len(content) > 3: # noqa: PLR2004
- return MessageType.ANO_SUFFIX
- if content in self.laugh_patterns:
- return MessageType.LAUGH
- return MessageType.OTHER
+ return
- def handle_laugh(self) -> str:
- return random.choice(self.laugh_patterns) # noqa: S311
-
- def handle_ano_suffix(self) -> str:
- return random.choice(self.ano_suffix_reply_patterns) # noqa: S311
-
-
-class SaveMessagesCog(commands.Cog):
- def __init__(self, bot: Bot):
- self.bot = bot
- self.store_svc = SentenceStorerSvc(db=MarkovDatabase(channel=bot.channel))
- self.generate_svc = SentenceGeneratorSvc(db=MarkovDatabase(channel=bot.channel))
- self.backoff_svc = BackoffService()
- self.message_handler = MessageHandler(self._send_message)
-
- self.send_functions = {
- MessageType.YES: self._create_typed_send("yes"),
- MessageType.WHAT: self._create_typed_send("what"),
- MessageType.LAUGH: self._create_typed_send("laugh"),
- MessageType.ANO_SUFFIX: self._create_typed_send("ano_suffix"),
- }
-
- for func in self.send_functions.values():
- self.backoff_svc.add_callable(func, backoff_seconds=10)
-
- def _create_typed_send(self, type_name: str):
- """Creates a send function for a specific message type"""
-
- async def typed_send(content: str):
- if hasattr(self, "current_message"):
- await self.current_message.channel.send(content)
-
- # Set a unique name for the function to ensure it's treated as distinct
- typed_send.__name__ = f"send_{type_name}"
- return typed_send
-
- async def _send_message(self, content: str):
- """Generic send message function (for non-backoff uses)"""
- if hasattr(self, "current_message"):
- await self.current_message.channel.send(content)
-
- def is_bot_mention(self, tok: str) -> bool:
- return tok.lower() == str(self.bot.nick).lower()
-
- async def _handle_bot_mention(self, message: Message) -> str | None:
- content = (message.content or "").strip()
- if not content:
- return None
-
- tokens = content.split()
- contains_mention = any(self.is_bot_mention(t) for t in tokens)
- if not contains_mention:
- return None
-
- # Find the first non-mention token as seed
- non_mention_tokens = (
- t.strip(".,!?;:") for t in tokens if not self.is_bot_mention(t)
- )
- seed = next((t for t in non_mention_tokens if t), None)
-
- if not seed:
- return None
-
- sentence = await self.generate_svc.run(seed)
- if not sentence:
- return None
-
- await message.channel.send(f"@{message.author.name} {sentence}")
-
- return sentence
-
- @commands.Cog.event()
- async def event_message(self, message):
- """Main message event handler"""
if not message.author:
return
- self.current_message = message
-
- await self.store_svc.run(message.content)
-
- # If the message contains a mention to this bot, reply by generating
- # a sentence from the first word that is not the bot username itself.
- if await self._handle_bot_mention(message):
- # If the bot actually replies with something, it should not try to send
- # any other type of reply
- return
-
- msg_type = self.message_handler.get_message_type(message.content)
-
- response = None
-
- match msg_type:
- case MessageType.COMMAND:
- return
- case MessageType.YES:
- response = "Indeed"
- case MessageType.WHAT:
- response = "WHAT Ramon"
- case MessageType.LAUGH:
- response = self.message_handler.handle_laugh()
- case MessageType.ANO_SUFFIX:
- response = (
- f"@{message.author.name} {self.message_handler.handle_ano_suffix()}"
- )
- case MessageType.OTHER:
- return
-
- if response and msg_type in self.send_functions:
- await self.backoff_svc.call_async(self.send_functions[msg_type], response)
+ await self.store_svc.run(content)
class BotsManager:
- def __init__(self, s: Settings):
+ def __init__(self):
self.bots: dict[str, Bot] = {}
- self.s = s
- def add_bot(self, user: User, channel: str, chatbot: Chatbot):
- if user.username in self.bots:
- logger.info(f"Bot for {user.username} already exists")
+ def add_bot(self, user: User, channel: str, chatbot_settings: ChatbotSettings):
+ if user.user in self.bots:
+ logger.info(f"Bot for {user.user} already exists")
return
-
- logger.info(f"Adding bot for {user.username}")
- bot = Bot(user=user, channel=channel, chatbot=chatbot, settings=self.s)
+ logger.info(f"Adding bot for {user.user}")
+ bot = Bot(user=user, channel=channel, chatbot_settings=chatbot_settings)
bot.add_cog(SaveMessagesCog(bot))
- bot.add_cog(HelloMessagesCog(bot))
- self.bots[user.username] = bot
+ self.bots[user.user] = bot
async def run_user_bot(self, user: User):
- if user.username not in self.bots:
- return None
-
- logger.info(f"Starting bot for {user.username}")
-
- bot = self.bots[user.username]
-
- @retry(
- stop=stop_after_attempt(5),
- wait=wait_exponential(multiplier=2, min=2, max=60),
- retry=retry_if_exception_type((ConnectionError, TimeoutError, OSError)),
- )
- async def start_bot_with_retry():
- await bot.start()
-
- task = asyncio.create_task(start_bot_with_retry())
-
- def on_bot_done(future):
- try:
- if future.cancelled():
- logger.warning(f"Bot for {user.username} was cancelled")
- elif future.exception():
- logger.error(
- f"Bot for {user.username} failed: {future.exception()}"
- )
- else:
- logger.info(f"Bot for {user.username} stopped normally")
- except Exception as e: # noqa: BLE001
- logger.error(f"Error in bot completion callback: {e}")
-
- task.add_done_callback(on_bot_done)
-
- bot.start_routines()
-
- return task
-
- async def run_user_bot2(self, user: User):
- if user.username not in self.bots:
+ if user.user not in self.bots:
return
- logger.info(f"Starting bot for {user.username}")
- bot = self.bots[user.username]
+ logger.info(f"Starting bot for {user.user}")
+ bot = self.bots[user.user]
task = asyncio.create_task(bot.start())
- task.add_done_callback(
- lambda x: logger.info(f"Bot for {user.username} stopped")
- )
-
+ task.add_done_callback(lambda x: logger.info(f"Bot for {user.user} stopped"))
bot.start_routines()
async def stop_user_bot(self, user: User):
- if user.username not in self.bots:
+ if user.user not in self.bots:
return
- bot = self.bots.pop(user.username)
+ bot = self.bots.pop(user.user)
await bot.close()
bot.stop_routines()
diff --git a/src/huesoporro/infra/authenticator.py b/src/huesoporro/infra/authenticator.py
index 987ff60..9bad27c 100644
--- a/src/huesoporro/infra/authenticator.py
+++ b/src/huesoporro/infra/authenticator.py
@@ -2,8 +2,8 @@ import httpx
from litestar.exceptions import HTTPException
from pydantic import BaseModel, ConfigDict, Field
-from huesoporro.models import TwitchAuth
-from huesoporro.settings import Settings
+from src.huesoporro.models import TwitchAuth
+from src.huesoporro.settings import Settings
class TwitchAuthenticator(BaseModel):
@@ -17,28 +17,20 @@ class TwitchAuthenticator(BaseModel):
response = await self.client.post(
"/oauth2/token",
data={
- "client_id": self.s.twitch_client_id,
- "client_secret": self.s.twitch_client_secret.get_secret_value(),
+ "client_id": Settings.get().twitch_client_id,
+ "client_secret": Settings.get().twitch_client_secret.get_secret_value(),
"grant_type": "authorization_code",
"code": code,
- "redirect_uri": f"{self.s.server_hostname}o/code",
+ "redirect_uri": f"{Settings.get().server_hostname}o/code",
},
headers={"Accept": "application/json"},
)
- if auto_refresh and response.status_code == 401: # noqa: PLR2004
+ if auto_refresh and response.status_code == 401:
return await self.refresh_token(response.json()["refresh_token"])
response.raise_for_status()
- profile = await self.get_userinfo(response.json()["access_token"])
- return TwitchAuth(**response.json(), userinfo=profile)
-
- async def get_userinfo(self, access_token):
- response = await self.client.get(
- "/oauth2/userinfo", headers={"Authorization": f"Bearer {access_token}"}
- )
- response.raise_for_status()
- return response.json()
+ return TwitchAuth(**response.json())
async def refresh_token(self, refresh_token: str) -> TwitchAuth:
response = await self.client.post(
@@ -52,8 +44,7 @@ class TwitchAuthenticator(BaseModel):
headers={"Accept": "application/json"},
)
response.raise_for_status()
- profile = await self.get_userinfo(response.json()["access_token"])
- return TwitchAuth(**response.json(), userinfo=profile)
+ return TwitchAuth(**response.json())
async def validate_token(self, access_token: str) -> str:
response = await self.client.get(
@@ -69,9 +60,3 @@ class TwitchAuthenticator(BaseModel):
raise HTTPException(status_code=403, detail="Forbidden")
return user
-
- async def token_is_valid(self, access_token: str) -> bool:
- response = await self.client.get(
- "/oauth2/validate", headers={"Authorization": f"OAuth {access_token}"}
- )
- return response.status_code == 200 # noqa: PLR2004
diff --git a/src/huesoporro/infra/db.py b/src/huesoporro/infra/db.py
new file mode 100644
index 0000000..3bb481c
--- /dev/null
+++ b/src/huesoporro/infra/db.py
@@ -0,0 +1,134 @@
+import datetime
+from contextlib import asynccontextmanager
+
+import aiosqlite
+from pydantic import BaseModel, Field
+
+from src.huesoporro.models import ChatbotSettings, User
+from src.huesoporro.settings import Settings
+from loguru import logger
+
+
+class Database(BaseModel):
+ s: Settings = Field(default_factory=Settings.get)
+
+ @asynccontextmanager
+ async def get_client(self, auto_commit=True):
+ logger.info(f"Opening database connection: {self.s.db_filepath}")
+ async with aiosqlite.connect(self.s.db_filepath) as db:
+ yield db
+ if auto_commit:
+ await db.commit()
+
+ @staticmethod
+ def get_now() -> float:
+ return datetime.datetime.now(datetime.UTC).timestamp()
+
+ async def save_user(self, user: User, auto_commit=True):
+ async with self.get_client(auto_commit=auto_commit) as db:
+ async with db.execute(
+ "SELECT * FROM users WHERE user = ?", (user.user,)
+ ) as cursor:
+ result = await cursor.fetchone()
+ if result:
+ await db.execute(
+ "UPDATE users SET access_token = ?, refresh_token = ?, expires_at = ?, last_updated_at = ? WHERE user = ?",
+ (
+ user.twitch_auth.access_token,
+ user.twitch_auth.refresh_token,
+ user.expires_at,
+ self.get_now(),
+ user.user,
+ ),
+ )
+ return
+
+ await db.execute(
+ "INSERT INTO users (user, access_token, refresh_token, expires_at, last_updated_at) VALUES (?,?,?,?,?)",
+ (
+ user.user,
+ user.twitch_auth.access_token,
+ user.twitch_auth.refresh_token,
+ user.expires_at,
+ self.get_now(),
+ ),
+ )
+
+ async def save_quote(self, channel: str, quote: str, author: str, auto_commit=True):
+ async with self.get_client(auto_commit=auto_commit) as db:
+ await db.execute(
+ "INSERT INTO quotes (channel, quote, author) VALUES (?,?,?)",
+ (channel, quote, author),
+ )
+
+ async def save_chatbot_settings(
+ self, user: User, chatbot_settings: ChatbotSettings, auto_commit: bool = True
+ ):
+ async with self.get_client(auto_commit=auto_commit) as db:
+ current_settings = await self.get_chatbot_settings(user)
+ if current_settings:
+ await db.execute(
+ """UPDATE settings SET
+ automatic_generation_timer = ?,
+ automatic_quote_timer = ?,
+ mods = ?,
+ last_updated_at = ?
+ WHERE user_id = ?
+ """,
+ (
+ chatbot_settings.automatic_generation_timer,
+ chatbot_settings.automatic_quote_timer,
+ chatbot_settings.mods_as_string,
+ self.get_now(),
+ user.user,
+ ),
+ )
+ return
+
+ await db.execute(
+ """INSERT INTO settings (
+ user_id,
+ automatic_generation_timer,
+ automatic_quote_timer,
+ mods,
+ created_at,
+ last_updated_at
+ ) VALUES(?,?,?,?,?,?)
+ """,
+ (
+ user.user,
+ chatbot_settings.automatic_generation_timer,
+ chatbot_settings.automatic_quote_timer,
+ chatbot_settings.mods_as_string,
+ self.get_now(),
+ self.get_now(),
+ ),
+ )
+
+ async def get_chatbot_settings(self, user: User) -> ChatbotSettings | None:
+ async with self.get_client() as db:
+ db.row_factory = aiosqlite.Row
+ async with db.execute(
+ "SELECT * FROM settings WHERE user_id = ?", (user.user,)
+ ) as cursor:
+ result = await cursor.fetchone()
+ if not result:
+ return None
+ return ChatbotSettings(**dict(result))
+
+ async def save_sentence(self, sentence: str, auto_commit=True):
+ async with self.get_client(auto_commit=auto_commit) as db:
+ await db.execute(
+ "INSERT INTO sentences (sentence) VALUES (?)",
+ (sentence,),
+ )
+ await db.commit()
+
+ async def get_random_quote(self, channel_name: str):
+ async with self.get_client() as db:
+ async with db.execute(
+ "SELECT quote, author FROM quotes WHERE channel = ? ORDER BY RANDOM() LIMIT 1",
+ (channel_name,),
+ ) as cursor:
+ result = await cursor.fetchone()
+ return result
diff --git a/src/huesoporro/infra/repos.py b/src/huesoporro/infra/repos.py
deleted file mode 100644
index 2f65997..0000000
--- a/src/huesoporro/infra/repos.py
+++ /dev/null
@@ -1,411 +0,0 @@
-import json
-from abc import ABC, abstractmethod
-from contextlib import asynccontextmanager
-from typing import Generic, TypeVar
-from uuid import UUID
-
-import aiosqlite
-from pydantic import BaseModel, Field
-
-from huesoporro import utils
-from huesoporro.models import Chatbot, Quote, User
-from huesoporro.settings import Settings
-
-T = TypeVar("T", bound=BaseModel)
-
-
-class IRepo(BaseModel, ABC, Generic[T]):
- s: Settings = Field(default_factory=Settings.get)
-
- @asynccontextmanager
- async def get_client(self, auto_commit=True):
- async with aiosqlite.connect(self.s.db_filepath) as db:
- db.row_factory = aiosqlite.Row
- yield db
- if auto_commit:
- await db.commit()
-
- @abstractmethod
- async def create(self, obj: T, auto_commit=True) -> T:
- pass # pragma: no cover
-
- @abstractmethod
- async def update(self, obj: T, auto_commit=True) -> T:
- pass # pragma: no cover
-
- @abstractmethod
- async def delete(self, obj: T, auto_commit=True):
- pass # pragma: no cover
-
- @abstractmethod
- async def get_by_id(self, obj_id: UUID, auto_commit=True) -> T | None:
- pass # pragma: no cover
-
- @abstractmethod
- async def list(self, offset: int = 0, limit: int = 10, auto_commit=True) -> list[T]:
- pass # pragma: no cover
-
-
-class UserRepo(IRepo[User]):
- @staticmethod
- def _deserialize(data: dict) -> User:
- return User(
- id=UUID(data["id"]),
- username=data["username"],
- created_at=data["created_at"],
- last_updated_at=data["last_updated_at"],
- external_auth=json.loads(data["external_auth"]),
- )
-
- async def get_by_id(self, obj_id: UUID, auto_commit=True) -> User | None:
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- await db.execute(
- """
- SELECT *
- FROM users
- WHERE id = ?
- """,
- (obj_id.hex,),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- if not data:
- return None
- return self._deserialize(data)
-
- async def create(self, obj: User, auto_commit=True) -> User:
- if await self.get_by_username(obj.username):
- raise ValueError(f"User {obj.username} already exists")
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- await db.execute(
- """INSERT INTO users (id, username, external_auth, created_at, last_updated_at)
- VALUES (?, ?, ?, ?, ?) RETURNING *
- """,
- (
- obj.id.hex,
- obj.username,
- obj.serialize_external_auth(),
- obj.created_at,
- obj.last_updated_at,
- ),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- return self._deserialize(data)
-
- async def update(self, obj: User, auto_commit=True) -> User:
- if not await self.get_by_id(obj.id):
- raise ValueError(f"User {obj.username} does not exist")
-
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- db.execute(
- """
- UPDATE users
- SET username = ?,
- external_auth = ?,
- last_updated_at = ?
- WHERE id = ? RETURNING *
- """,
- (
- obj.username,
- obj.serialize_external_auth(),
- obj.last_updated_at,
- obj.id.hex,
- ),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- return self._deserialize(data)
-
- async def delete(self, obj: User, auto_commit=True):
- async with self.get_client(auto_commit=auto_commit) as db:
- await db.execute(
- """
- DELETE
- FROM users
- WHERE id = ?
- """,
- (obj.id.hex,),
- )
-
- async def get_by_username(self, user: str, auto_commit=True) -> User | None:
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- db.execute(
- """
- SELECT *
- FROM users
- WHERE username = ?
- """,
- (user,),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- if not data:
- return None
- return User(
- id=UUID(data["id"]),
- username=data["username"],
- created_at=data["created_at"],
- last_updated_at=data["last_updated_at"],
- external_auth=json.loads(data["external_auth"]),
- )
-
- async def list( # type: ignore[empty-body]
- self, offset: int = 0, limit: int = 10, auto_commit=True
- ) -> list[User]:
- pass # pragma: no cover
-
- async def count(self, obj: User, auto_commit=True):
- pass # pragma: no cover
-
-
-class QuoteRepo(IRepo[Quote]):
- @staticmethod
- def _deserialize(data: dict) -> Quote:
- return Quote(
- id=UUID(data["id"]),
- quote=data["quote"],
- author=data["author"],
- channel_name=data["channel"],
- created_at=data["created_at"],
- last_updated_at=data["last_updated_at"],
- is_active=data["is_active"],
- )
-
- async def create(self, obj: Quote, auto_commit=True) -> Quote:
- if await self.get_by_quote(obj.quote):
- raise ValueError(f"Quote {obj.quote} already exists")
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- await db.execute(
- """
- INSERT INTO quotes (id, quote, author, channel, created_at, is_active, last_updated_at)
- VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING *
- """,
- (
- obj.id.hex,
- obj.quote,
- obj.author,
- obj.channel_name,
- obj.created_at,
- obj.is_active,
- obj.last_updated_at,
- ),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- return self._deserialize(data)
-
- async def update(self, obj: Quote, auto_commit=True) -> Quote: # type: ignore[empty-body]
- if not await self.get_by_id(obj.id):
- raise ValueError(f"Quote {obj.id} does not exist")
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- await db.execute(
- """
- UPDATE quotes
- SET quote = ?,
- author = ?,
- channel = ?,
- is_active = ?,
- last_updated_at = ?
- WHERE id = ? RETURNING *
- """,
- (
- obj.quote,
- obj.author,
- obj.channel_name,
- obj.is_active,
- utils.get_utc_now(),
- obj.id.hex,
- ),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- return self._deserialize(data)
-
- async def delete(self, obj: Quote, auto_commit=True):
- async with self.get_client(auto_commit=auto_commit) as db:
- await db.execute(
- """
- DELETE
- FROM quotes
- WHERE id = ?
- """,
- (obj.id.hex,),
- )
-
- async def get_by_id(self, obj_id: UUID, auto_commit=True) -> Quote | None: # type: ignore[empty-body]
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- db.execute(
- """
- SELECT *
- FROM quotes
- WHERE id = ?
- """,
- (obj_id.hex,),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- if not data:
- return None
- return self._deserialize(data)
-
- async def get_by_quote(self, quote: str, auto_commit=True) -> Quote | None:
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- db.execute(
- """
- SELECT *
- FROM quotes
- WHERE quote = ?
- """,
- (quote,),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- if not data:
- return None
- return self._deserialize(data)
-
- async def list( # type: ignore[empty-body]
- self, offset: int = 0, limit: int = 10, auto_commit=True
- ) -> list[Quote]:
- async with self.get_client() as db:
- db.row_factory = aiosqlite.Row
- async with db.execute(
- "SELECT * FROM quotes LIMIT ? OFFSET ?", (limit, offset)
- ) as cursor:
- results = await cursor.fetchall()
- return [self._deserialize(result) for result in results]
-
- async def get_random(self, channel_name: str, auto_commit=True) -> Quote | None:
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- db.execute(
- """
- SELECT *
- FROM quotes
- WHERE channel = ?
- AND is_active = 1
- ORDER BY RANDOM() LIMIT 1
- """,
- (channel_name,),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- if not data:
- return None
- return self._deserialize(data)
-
-
-class ChatbotRepo(IRepo[Chatbot]):
- @staticmethod
- def _deserialize(data: dict) -> Chatbot:
- return Chatbot(
- id=UUID(data["id"]),
- user_id=data["user_id"],
- automatic_generation_timer=data["automatic_generation_timer"],
- automatic_quote_timer=data["automatic_quote_timer"],
- mods=data["mods"].split(","),
- last_updated_at=data["last_updated_at"],
- created_at=data["created_at"],
- )
-
- async def create(self, obj: Chatbot, auto_commit=True) -> Chatbot:
- if await self.get_by_user_id(obj.user_id):
- raise ValueError(f"Chatbot {obj.user_id} already exists")
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- await db.execute(
- """INSERT INTO chatbot (id,
- user_id,
- automatic_generation_timer,
- automatic_quote_timer,
- mods,
- created_at,
- last_updated_at)
- VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING *
- """,
- (
- obj.id.hex,
- obj.user_id.hex,
- obj.automatic_generation_timer,
- obj.automatic_quote_timer,
- obj.mods_as_string,
- obj.created_at,
- obj.last_updated_at,
- ),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- return self._deserialize(data)
-
- async def update(self, obj: Chatbot, auto_commit=True) -> Chatbot:
- if not await self.get_by_user_id(obj.user_id):
- raise ValueError(f"Chatbot {obj.user_id} does not exist")
- async with (
- self.get_client(auto_commit=auto_commit) as db,
- await db.execute(
- """UPDATE chatbot
- SET automatic_generation_timer = ?,
- automatic_quote_timer = ?,
- mods = ?,
- last_updated_at = ?
- WHERE user_id = ? RETURNING *
- """,
- (
- obj.automatic_generation_timer,
- obj.automatic_quote_timer,
- obj.mods_as_string,
- utils.get_utc_now(),
- obj.user_id.hex,
- ),
- ) as cursor,
- ):
- data = await cursor.fetchone()
- return self._deserialize(data)
-
- async def delete(self, obj: Chatbot, auto_commit=True):
- if not await self.get_by_id(obj.id):
- raise ValueError(f"Chatbot {obj.id} does not exist")
- async with self.get_client() as db:
- await db.execute("DELETE FROM chatbot WHERE id = ?", (obj.id.hex,))
-
- async def get_by_id(self, obj_id: UUID, auto_commit=True) -> Chatbot | None: # type: ignore[empty-body]
- async with self.get_client() as db:
- db.row_factory = aiosqlite.Row
- async with db.execute(
- "SELECT * FROM chatbot WHERE id = ?", (obj_id.hex,)
- ) as cursor:
- result = await cursor.fetchone()
- if not result:
- return None
- return self._deserialize(result)
-
- async def get_by_user_id(self, user_id: UUID) -> Chatbot | None:
- async with self.get_client() as db:
- db.row_factory = aiosqlite.Row
- async with db.execute(
- "SELECT * FROM chatbot WHERE user_id = ?", (user_id.hex,)
- ) as cursor:
- result = await cursor.fetchone()
- if not result:
- return None
- return self._deserialize(result)
-
- async def list( # type: ignore[empty-body]
- self, offset: int = 0, limit: int = 10, auto_commit=True
- ) -> list[Chatbot]:
- async with self.get_client() as db:
- db.row_factory = aiosqlite.Row
- async with db.execute(
- "SELECT * FROM chatbot LIMIT ? OFFSET ?", (limit, offset)
- ) as cursor:
- results = await cursor.fetchall()
- return [self._deserialize(result) for result in results]
diff --git a/src/huesoporro/libs/db.py b/src/huesoporro/libs/db.py
index 615c706..a9faba2 100644
--- a/src/huesoporro/libs/db.py
+++ b/src/huesoporro/libs/db.py
@@ -4,12 +4,11 @@ import sqlite3
import string
from typing import Any
+import platformdirs
from loguru import logger
-from huesoporro.settings import Settings
-
-class MarkovDatabase:
+class Database:
"""
The database created is called `MarkovChain_{channel}.db`,
and populated with 27 + 27^2 = 756 tables. Firstly, 27 tables with the structure of
@@ -87,11 +86,14 @@ class MarkovDatabase:
to both get results from "hello" and "hello,".
"""
- def __init__(self, channel: str, settings: Settings | None = None):
- settings = settings or Settings.get()
-
- self.db_path = settings.default_data_path / f"MarkovChain_{channel}.db"
- self.user_data_path = self.db_path.parent
+ def __init__(self, channel: str):
+ self.user_data_path = platformdirs.user_data_path(
+ "huesoporro",
+ ensure_exists=True,
+ )
+ self.db_path = (
+ self.user_data_path / f"MarkovChain_{channel.replace('#', '').lower()}.db"
+ )
self._execute_queue: list = []
if self.db_path.is_file():
@@ -264,7 +266,7 @@ class MarkovDatabase:
);
""")
self.add_execute_queue(
- f'INSERT INTO MarkovGrammar{first_char}{second_char} SELECT * FROM MarkovGrammar{first_char} WHERE word2 LIKE "{second_char}%";', # noqa: S608
+ f'INSERT INTO MarkovGrammar{first_char}{second_char} SELECT * FROM MarkovGrammar{first_char} WHERE word2 LIKE "{second_char}%";',
)
self.add_execute_queue(
f'DELETE FROM MarkovGrammar{first_char} WHERE word2 LIKE "{second_char}%";', # noqa: S608
@@ -355,7 +357,7 @@ class MarkovDatabase:
from nltk import ngrams
- from huesoporro.libs.tokenizer import tokenize
+ from src.huesoporro.libs.tokenizer import tokenize
channel = channel.replace("#", "").lower()
copyfile(
diff --git a/src/huesoporro/main.py b/src/huesoporro/main.py
index fde026e..e2616b8 100644
--- a/src/huesoporro/main.py
+++ b/src/huesoporro/main.py
@@ -1,7 +1,9 @@
import uvicorn
-from huesoporro.settings import Settings
+from src.huesoporro.api.main import create_app
+from src.huesoporro.settings import Settings
if __name__ == "__main__":
settings = Settings.get()
- uvicorn.run("src.huesoporro.api.main:app", host=settings.host, port=settings.port)
+ app = create_app()
+ uvicorn.run(app, host=settings.host, port=settings.port)
diff --git a/src/huesoporro/models.py b/src/huesoporro/models.py
index ee6ca28..4680f92 100644
--- a/src/huesoporro/models.py
+++ b/src/huesoporro/models.py
@@ -1,95 +1,45 @@
-import datetime
-import json
-from typing import Literal
+from typing import Self
import jwt
-from pydantic import UUID4, AwareDatetime, BaseModel, Field, field_validator
+from pydantic import BaseModel, field_validator
-from huesoporro import utils
-from huesoporro.settings import Settings
+from src.huesoporro.settings import Settings
class TwitchAuth(BaseModel):
access_token: str
refresh_token: str
- userinfo: dict
-
-
-class ExternalAuth(BaseModel):
- credentials: dict
- type: Literal["twitch"] = "twitch"
class User(BaseModel):
- id: UUID4
- username: str
- external_auth: dict[Literal["twitch", "discord"], TwitchAuth]
- created_at: AwareDatetime = Field(default_factory=utils.get_utc_now)
- last_updated_at: AwareDatetime = Field(default_factory=utils.get_utc_now)
+ user: str
+ expires_at: float
+ twitch_auth: TwitchAuth
- def encode(
- self, settings: Settings | None = None, exclude_fields: set[str] | None = None
- ) -> str:
+ def encode(self, settings: Settings | None = None) -> str:
s = settings or Settings.get()
- exclude_fields = exclude_fields or {"external_auth"}
return jwt.encode(
- self.model_dump(exclude=exclude_fields, mode="json"),
+ self.model_dump(),
key=s.jwt_secret.get_secret_value(),
algorithm="HS256",
)
@classmethod
- def decode(cls, token: str, settings: Settings | None = None) -> dict:
+ def decode(cls, token: str, settings: Settings | None = None) -> Self:
s = settings or Settings.get()
- return jwt.decode(
+ decoded = jwt.decode(
token, key=s.jwt_secret.get_secret_value(), algorithms=["HS256"]
)
-
- @property
- def twitch_access_token(self):
- return self.external_auth["twitch"].access_token
-
- @property
- def twitch_refresh_token(self):
- return self.external_auth["twitch"].refresh_token
-
- @twitch_access_token.setter # type: ignore[attr-defined,no-redef]
- def twitch_access_token(self, value):
- self.external_auth["twitch"].access_token = value
-
- @twitch_refresh_token.setter # type: ignore[attr-defined,no-redef]
- def twitch_refresh_token(self, value):
- self.external_auth["twitch"].refresh_token = value
-
- def serialize_external_auth(self) -> str:
- """Return a JSON string with the inner pydantic model of external_auth serialized using model_dump"""
-
- return json.dumps({k: v.model_dump() for k, v in self.external_auth.items()})
+ return cls(**decoded)
-class Chatbot(BaseModel):
- """A chatbot is an entity that holds settings for a given user, it is NOT tied to a channel.
-
- Attributes:
- id (UUID4): The unique identifier for the chatbot.
- user_id (UUID): The user_id of the user that owns the chatbot.
- automatic_generation_timer (int): The timer for automatic generation of quotes.
- automatic_quote_timer (int): The timer for automatic quotes.
- mods (list[str]): The list of mods for the chatbot.
- """
-
- id: UUID4
- user_id: UUID4
+class ChatbotSettings(BaseModel):
automatic_generation_timer: int = 300
automatic_quote_timer: int = 500
- created_at: AwareDatetime = Field(default_factory=utils.get_utc_now)
- last_updated_at: AwareDatetime = Field(default_factory=utils.get_utc_now)
- mods: list[str] = Field(default_factory=list)
+ mods: list[str] | None = None
@property
def mods_as_string(self):
- if not self.mods:
- return ""
return ",".join(self.mods)
@field_validator("mods", mode="before")
@@ -98,19 +48,3 @@ class Chatbot(BaseModel):
if isinstance(v, str):
return v.split(",")
return v
-
-
-class Quote(BaseModel):
- id: UUID4
- quote: str
- author: str
- channel_name: str
- is_active: bool = True
- created_at: datetime.datetime = Field(default_factory=utils.get_utc_now)
- last_updated_at: datetime.datetime = Field(default_factory=utils.get_utc_now)
-
- def as_pretty(self) -> str:
- return f"ยซ{self.quote}ยป - {self.author}"
-
- def as_pretty_saved(self):
- return f"He aรฑadido la cita ยซ{self.quote}ยป de {self.author}"
diff --git a/src/huesoporro/settings.py b/src/huesoporro/settings.py
index a9dd968..1bc19f9 100644
--- a/src/huesoporro/settings.py
+++ b/src/huesoporro/settings.py
@@ -1,7 +1,6 @@
from functools import lru_cache
from pathlib import Path
-import platformdirs
from pydantic import Field, HttpUrl, SecretStr, field_validator
from pydantic_settings import BaseSettings
@@ -9,19 +8,18 @@ from pydantic_settings import BaseSettings
class Settings(BaseSettings):
port: int = 8000
host: str = "0.0.0.0" # noqa: S104
-
- default_data_path: Path = platformdirs.user_data_path(
- "huesoporro",
- ensure_exists=True,
- )
static_files_path: Path = Field(
default_factory=lambda: Path(__file__).parent / "static"
)
templates_files_path: Path = Field(
default_factory=lambda: Path(__file__).parent / "templates"
)
- tts_cache_path: Path = default_data_path / "tts_files"
- db_filepath: Path = default_data_path / "huesoporro.db"
+ tts_cache_path: Path = Field(
+ default_factory=lambda: Path(__file__).parent / "tts_files"
+ )
+ db_filepath: Path = Field(
+ default_factory=lambda: Path(__file__).parent / "huesoporro.db"
+ )
twitch_client_id: str
twitch_client_secret: SecretStr
jwt_secret: SecretStr
@@ -29,12 +27,12 @@ class Settings(BaseSettings):
default_factory=lambda: ["channel:bot", "chat:edit", "chat:read"]
)
allowed_users: list[str] | str = Field(default_factory=lambda: ["huesoporro"])
- server_hostname: HttpUrl = "http://localhost:8000" # type: ignore[assignment]
+ server_hostname: HttpUrl = "http://localhost:8000"
@staticmethod
@lru_cache(maxsize=1)
- def get(**data):
- return Settings(**data) # type: ignore[call-arg] # pydantic-setting magic
+ def get():
+ return Settings() # type: ignore[call-arg] # pydantic-setting magic
@field_validator("allowed_users")
@classmethod
diff --git a/src/huesoporro/static/js/utils.js b/src/huesoporro/static/js/utils.js
index 9bb1116..e014ab2 100644
--- a/src/huesoporro/static/js/utils.js
+++ b/src/huesoporro/static/js/utils.js
@@ -7,3 +7,36 @@ function getWebsocketProtocol() {
return "wss://";
}
}
+
+function addLogoutEvent() {
+ const logoutButton = document.getElementById("logoutButton");
+ logoutButton.addEventListener("click", () => {
+ document.cookie = "twitchLoginData=; expires=Thu, 01 Jan 1970 00:00:00 UTC";
+ window.location.href = "/";
+ });
+
+}
+
+function setCookie(name, value, days) {
+ const date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+ const expires = `expires=${date.toUTCString()}`;
+ document.cookie = `${name}=${value};${expires};path=/;SameSite=Strict`;
+}
+
+function getCookie(name) {
+ const cookieName = `${name}=`;
+ const decodedCookie = decodeURIComponent(document.cookie);
+ const cookieArray = decodedCookie.split(';');
+
+ for (let i = 0; i < cookieArray.length; i++) {
+ let cookie = cookieArray[i];
+ while (cookie.charAt(0) === ' ') {
+ cookie = cookie.substring(1);
+ }
+ if (cookie.indexOf(cookieName) === 0) {
+ return cookie.substring(cookieName.length, cookie.length);
+ }
+ }
+ return null;
+}
diff --git a/src/huesoporro/svc/authenticate.py b/src/huesoporro/svc/authenticate.py
new file mode 100644
index 0000000..346a407
--- /dev/null
+++ b/src/huesoporro/svc/authenticate.py
@@ -0,0 +1,26 @@
+import datetime
+
+from pydantic import BaseModel
+
+from src.huesoporro.infra.authenticator import TwitchAuthenticator
+from src.huesoporro.infra.db import Database
+from src.huesoporro.models import User
+
+
+class CodeAuthenticatorSvc(BaseModel):
+ db: Database
+ authenticator: TwitchAuthenticator
+
+ @staticmethod
+ def get_four_hours_from_now() -> float:
+ now = datetime.datetime.now(datetime.UTC)
+ four_hours_later = now + datetime.timedelta(hours=4)
+ return four_hours_later.timestamp()
+
+ async def run(self, code: str) -> User:
+ auth = await self.authenticator.get_token(code)
+ username = await self.authenticator.validate_token(auth.access_token)
+ expires_at = self.get_four_hours_from_now()
+ user = User(user=username, expires_at=expires_at, twitch_auth=auth)
+ await self.db.save_user(user)
+ return user
diff --git a/src/huesoporro/svc/backoff_service.py b/src/huesoporro/svc/backoff_service.py
deleted file mode 100644
index 08123d1..0000000
--- a/src/huesoporro/svc/backoff_service.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import asyncio
-import time
-from collections.abc import Callable
-
-from pydantic import BaseModel
-
-
-class CallableInfo(BaseModel):
- backoff_seconds: int
- last_call: float | None = None
- is_async: bool
-
-
-class BackoffService(BaseModel):
- """Use this service to implement a backoff strategy on random callables.
- The callable will be called the first time without delay but every subsequent
- call may be hold off for a given time
-
- Examples:
- >>> def callable(x): print(f"foo {x}")
- >>> backoff_service = BackoffService()
- >>> backoff_service.add_callable(callable, backoff_time=3)
- >>> backoff_service.call(callable, "bar") # prints "foo bar"
- >>> backoff_service.call(callable, "baz") # prints nothing
- >>> # wait 3 seconds before calling callable again
- >>> backoff_service.call(callable, "qux") # prints "foo qux"
- """
-
- callables: dict[Callable, CallableInfo] = {}
-
- def add_callable(self, func: Callable, backoff_seconds: int):
- """Adds a callable to the local mapper with its backoff configuration.
-
- Args:
- func: The function to be registered
- backoff_seconds: The number of seconds to wait between successive calls
- """
- self.callables[func] = CallableInfo(
- backoff_seconds=backoff_seconds, is_async=self._is_async(func)
- )
-
- @staticmethod
- def _is_async(func: Callable) -> bool:
- """Checks if the callable is async"""
- return asyncio.iscoroutinefunction(func)
-
- def _can_call(self, func: Callable) -> bool:
- """Determines if enough time has passed since the last call"""
- if func not in self.callables:
- raise ValueError(f"Function {func} not registered with backoff service")
-
- func_info = self.callables[func]
- last_call = func_info.last_call
-
- if last_call is None:
- return True
-
- elapsed = time.time() - last_call
- return elapsed >= func_info.backoff_seconds
-
- def call(self, func: Callable, *args, **kwargs):
- """Calls the callable with arguments and returns its result if it isn't held off
-
- Args:
- func: The function to call
- *args: Positional arguments for the function
- **kwargs: Keyword arguments for the function
-
- Returns:
- Optional[Any]: The result of the function call if executed, None if held off
- """
- if func not in self.callables:
- raise ValueError(f"Function {func} not registered with backoff service")
-
- if self.callables[func].is_async:
- raise ValueError(
- "Cannot call async function with .call(), use .call_async() instead"
- )
-
- if not self._can_call(func):
- return None
-
- result = func(*args, **kwargs)
- self.callables[func].last_call = time.time()
- return result
-
- async def call_async(self, func: Callable, *args, **kwargs):
- """Same as .call(...) but for async functions
-
- Args:
- func: The async function to call
- *args: Positional arguments for the function
- **kwargs: Keyword arguments for the function
-
- Returns:
- Optional[Any]: The result of the async function call if executed, None if held off
- """
- if func not in self.callables:
- raise ValueError(f"Function {func} not registered with backoff service")
-
- if not self.callables[func].is_async:
- raise ValueError(
- "Cannot call sync function with .call_async(), use .call() instead"
- )
-
- if not self._can_call(func):
- return None
-
- result = await func(*args, **kwargs)
- self.callables[func].last_call = time.time()
- return result
diff --git a/src/huesoporro/svc/chatbot_svcs.py b/src/huesoporro/svc/chatbot_svcs.py
deleted file mode 100644
index 544fe51..0000000
--- a/src/huesoporro/svc/chatbot_svcs.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from uuid import UUID
-
-from pydantic import BaseModel
-
-from huesoporro.infra.repos import ChatbotRepo
-from huesoporro.models import Chatbot
-
-
-class CreateChatbotSvc(BaseModel):
- repo: ChatbotRepo
-
- async def run(self, chatbot: Chatbot):
- return await self.repo.create(chatbot)
-
-
-class GetChatbotByUserIdSvc(BaseModel):
- repo: ChatbotRepo
-
- async def run(self, user_id: UUID) -> Chatbot | None:
- return await self.repo.get_by_user_id(user_id=user_id)
-
-
-class UpdateChatbotSvc(BaseModel):
- repo: ChatbotRepo
-
- async def run(self, chatbot: Chatbot):
- return await self.repo.update(obj=chatbot)
diff --git a/src/huesoporro/svc/clean_cc_svc.py b/src/huesoporro/svc/clean_cc_svc.py
deleted file mode 100644
index 8680d71..0000000
--- a/src/huesoporro/svc/clean_cc_svc.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import re
-from collections.abc import Generator
-from pathlib import Path
-
-from pydantic import BaseModel
-
-
-class CleanCCSvc(BaseModel):
- @classmethod
- def clean_vtt_line(cls, line):
- """
- Clean a single line of VTT text by removing timestamps and HTML tags.
-
- Args:
- line (str): Single line from VTT file
-
- Returns:
- str: Cleaned line or None if line should be skipped
- """
- # Skip empty lines
- if not line.strip():
- return None
- # Skip WEBVTT header
- if line.strip().startswith("WEBVTT"):
- return None
-
- # Skip timestamp lines (e.g., "00:00:00.000 --> 00:00:02.000")
- if re.match(
- r"\d{2}:\d{2}:\d{2}\.\d{3}\s+-{2}>\s+\d{2}:\d{2}:\d{2}\.\d{3}", line
- ):
- return None
-
- # Skip numeric identifiers
- if line.strip().isdigit():
- return None
-
- # Remove HTML-style tags
- line = re.sub(r"<[^>]+>", "", line)
-
- # Remove multiple spaces
- line = " ".join(line.split())
-
- return line.strip()
-
- @classmethod
- def process_vtt_file(cls, file_path: Path):
- seen_lines = set()
-
- with file_path.open("r", encoding="utf-8") as f:
- for line in f:
- cleaned = cls.clean_vtt_line(line)
- if line not in seen_lines:
- seen_lines.add(line)
- yield cleaned
-
- def run(self, cc_file_path: Path) -> Generator[str, None, None]:
- return self.process_vtt_file(cc_file_path)
diff --git a/src/huesoporro/svc/download_closed_captions.py b/src/huesoporro/svc/download_closed_captions.py
deleted file mode 100644
index a8b6796..0000000
--- a/src/huesoporro/svc/download_closed_captions.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import tempfile
-from collections.abc import Iterator
-from pathlib import Path
-
-import yt_dlp
-from loguru import logger
-from pydantic import BaseModel
-
-
-class DownloadClosedCaptionsSvc(BaseModel):
- @staticmethod
- def run(youtube_url: str, sub_lang: str = "es") -> Iterator[Path]:
- """Download closed captions from a yt video and save it to a temp file
-
- Args:
- youtube_url: URL of the YouTube video
- sub_lang: Language code for the subtitles (default: "es" for Spanish)
-
- Returns:
- Path: Path to the downloaded subtitles file
-
- Raises:
- ValueError: If subtitles are not available in the requested language
- """
- temp_dir = Path(tempfile.mkdtemp())
- logger.info(f"Downloading subtitles for {youtube_url} to {temp_dir}")
- ydl_opts = {
- "skip_download": True,
- "writesubtitles": True,
- "writeautomaticsub": True,
- "subtitleslangs": [sub_lang],
- "subtitlesformat": "vtt",
- "cookiesfrombrowser": ("firefox",),
- "paths": {"home": str(temp_dir)},
- "quiet": True,
- }
-
- try:
- with yt_dlp.YoutubeDL(ydl_opts) as ydl:
- ydl.download([youtube_url])
- return temp_dir.glob(f"*.{sub_lang}.vtt")
-
- except yt_dlp.utils.DownloadError as exc:
- raise ValueError(f"Failed to download subtitles: {exc!s}") from exc
diff --git a/src/huesoporro/svc/generate.py b/src/huesoporro/svc/generate.py
index d4a1766..f6f91f6 100644
--- a/src/huesoporro/svc/generate.py
+++ b/src/huesoporro/svc/generate.py
@@ -3,8 +3,8 @@ import string
from loguru import logger
from pydantic import BaseModel, ConfigDict
-from huesoporro.libs.db import MarkovDatabase as MarkovDB
-from huesoporro.libs.tokenizer import detokenize, tokenize
+from src.huesoporro.libs.db import Database as MarkovDB
+from src.huesoporro.libs.tokenizer import detokenize, tokenize
class SentenceGeneratorSvc(BaseModel):
@@ -15,6 +15,18 @@ class SentenceGeneratorSvc(BaseModel):
sentence_separator: str = " "
model_config = ConfigDict(arbitrary_types_allowed=True)
+ def is_mod(self, username: str, channel: str) -> bool:
+ """True if the user is a moderator.
+
+ Args:
+ username (str): The name of the user to check
+ channel (str): The name of the channel
+
+ Returns:
+ bool: True if the user is a moderator.
+ """
+ return username in self.s.mods or username == channel
+
@staticmethod
def get_sentence_length(sentences: list[list[str]]) -> int:
"""Given a list of tokens representing a sentence, return the number of words in there.
@@ -51,6 +63,10 @@ class SentenceGeneratorSvc(BaseModel):
# e.g. when the first sentence has fewer words than self.min_sentence_length.
sentences: list[list | list[str]] = [[]]
+ # Check for commands or recursion, eg: !generate !generate
+ if len(params) > 0:
+ return "You can't make me do commands, you madman!", False
+
# Get the starting key and starting sentence.
# If there is more than 1 param, get the last 2 as the key.
# Note that self.key_length is fixed to 2 in this implementation
@@ -132,12 +148,11 @@ class SentenceGeneratorSvc(BaseModel):
async def run(
self,
sentence: str | None = None,
- ) -> str | None:
- split_sentence = tokenize(sentence) if sentence else None
-
- logger.info(f"Generating sentence from {split_sentence}")
- generated_sentence, success = self.generate(split_sentence)
- logger.info(f"Generated sentence: {generated_sentence}")
- if not success:
- return None
- return generated_sentence
+ ) -> str|None:
+ if sentence:
+ sentence = tokenize(sentence)
+ logger.info(f"Generating sentence from {sentence}")
+ sentence, success = self.generate(sentence)
+ logger.info(f"Generated sentence: {sentence}")
+ if success:
+ return sentence
diff --git a/src/huesoporro/svc/get_chatbot_settings.py b/src/huesoporro/svc/get_chatbot_settings.py
new file mode 100644
index 0000000..a1bfc2f
--- /dev/null
+++ b/src/huesoporro/svc/get_chatbot_settings.py
@@ -0,0 +1,11 @@
+from pydantic import BaseModel
+
+from src.huesoporro.infra.db import Database
+from src.huesoporro.models import ChatbotSettings, User
+
+
+class ChatbotSettingsGetterSvc(BaseModel):
+ db: Database
+
+ async def run(self, user: User) -> ChatbotSettings | None:
+ return await self.db.get_chatbot_settings(user=user)
diff --git a/src/huesoporro/svc/get_random_quote.py b/src/huesoporro/svc/get_random_quote.py
new file mode 100644
index 0000000..4371d4e
--- /dev/null
+++ b/src/huesoporro/svc/get_random_quote.py
@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+from src.huesoporro.infra.db import Database
+
+
+class RandomQuoteGetterSvc(BaseModel):
+ db: Database
+
+ async def run(self, channel_name: str) -> tuple[str, str]:
+ return await self.db.get_random_quote(channel_name=channel_name)
diff --git a/src/huesoporro/svc/hello.py b/src/huesoporro/svc/hello.py
index 2edd970..119095b 100644
--- a/src/huesoporro/svc/hello.py
+++ b/src/huesoporro/svc/hello.py
@@ -1,35 +1,10 @@
import random
-from functools import lru_cache
-from loguru import logger
from pydantic import BaseModel, Field
class HelloGeneratorSvc(BaseModel):
- hellos: list[str] = [
- "Hola",
- "Ayo",
- "Hi",
- "Bon dรญa",
- "Hola mi tremendo elemento",
- "HOLA",
- "hiii",
- ]
+ hellos: list[str] = Field(default_factory=lambda: ["Hola", "Ayo", "Hi", "Bon dรญa"])
- greeted_users: dict[str, str] = Field(default_factory=dict)
-
- def run(self, username: str) -> str | None:
- if username in self.greeted_users:
- logger.info(f"User {username} already greeted")
- return None
-
- greeting = f"{random.choice(self.hellos)} @{username}" # noqa: S311
-
- self.greeted_users[username] = greeting
-
- return greeting
-
-
-@lru_cache(maxsize=1)
-def get_hello_generator_svc() -> HelloGeneratorSvc:
- return HelloGeneratorSvc() # pragma: no cover
+ def run(self, username: str):
+ return f"{random.choice(self.hellos)} {username}"
diff --git a/src/huesoporro/svc/is_mod.py b/src/huesoporro/svc/is_mod.py
index 6e45f5e..8450448 100644
--- a/src/huesoporro/svc/is_mod.py
+++ b/src/huesoporro/svc/is_mod.py
@@ -1,26 +1,12 @@
from pydantic import BaseModel
-from huesoporro.infra.repos import ChatbotRepo
-from huesoporro.models import User
+from src.huesoporro.infra.db import Database
+from src.huesoporro.models import User
class IsModSvc(BaseModel):
- repo: ChatbotRepo
+ db: Database
- async def run(self, username: str, channel: str, user: User) -> bool:
- """A user given username is a mod if they're the same as the current channel or if they're in the modlist
- available in a user's settings
-
- Args:
- username (str): The username to check if it's a mod
- channel (str): The current channel
- user (User): User object the chatbot belongs to
- """
-
- if channel == username:
- return True
-
- chatbot = await self.repo.get_by_user_id(user_id=user.id)
- if not chatbot:
- return False
- return username in chatbot.mods
+ async def run(self, user: User, username: str) -> bool:
+ chatbot_settings = await self.db.get_chatbot_settings(user=user)
+ return username in chatbot_settings.mods
diff --git a/src/huesoporro/svc/quotes_svcs.py b/src/huesoporro/svc/quotes_svcs.py
deleted file mode 100644
index 988afb8..0000000
--- a/src/huesoporro/svc/quotes_svcs.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from pydantic import BaseModel
-
-from huesoporro.infra.repos import QuoteRepo
-from huesoporro.models import Quote
-
-
-class GetRandomQuoteSvc(BaseModel):
- repo: QuoteRepo
-
- async def run(self, channel_name: str) -> Quote | None:
- return await self.repo.get_random(channel_name=channel_name)
-
-
-class CreateQuoteSvc(BaseModel):
- repo: QuoteRepo
-
- async def run(self, quote: Quote) -> Quote:
- return await self.repo.create(obj=quote)
diff --git a/src/huesoporro/svc/refresh.py b/src/huesoporro/svc/refresh.py
new file mode 100644
index 0000000..9209743
--- /dev/null
+++ b/src/huesoporro/svc/refresh.py
@@ -0,0 +1,27 @@
+import datetime
+
+from pydantic import BaseModel
+
+from src.huesoporro.infra.authenticator import TwitchAuthenticator
+from src.huesoporro.infra.db import Database
+from src.huesoporro.models import User
+
+
+class RefreshTokenAuthenticator(BaseModel):
+ db: Database
+ authenticator: TwitchAuthenticator
+
+ @staticmethod
+ def get_four_hours_from_now() -> float:
+ now = datetime.datetime.now(datetime.UTC)
+ four_hours_later = now + datetime.timedelta(hours=4)
+ return four_hours_later.timestamp()
+
+ async def run(self, refresh_token: str) -> User:
+ auth = await self.authenticator.refresh_token(refresh_token)
+ username = await self.authenticator.validate_token(auth.access_token)
+ expires_at = self.get_four_hours_from_now()
+
+ user = User(user=username, expires_at=expires_at, twitch_auth=auth)
+ await self.db.save_user(user)
+ return user
diff --git a/src/huesoporro/svc/store.py b/src/huesoporro/svc/store.py
index 1a57b98..fc45d46 100644
--- a/src/huesoporro/svc/store.py
+++ b/src/huesoporro/svc/store.py
@@ -1,14 +1,13 @@
-# pragma: no cover
from loguru import logger
from nltk.tokenize import sent_tokenize
from pydantic import BaseModel, ConfigDict
-from huesoporro.libs.db import MarkovDatabase
-from huesoporro.libs.tokenizer import tokenize
+from src.huesoporro.libs.db import Database as MarkovDB
+from src.huesoporro.libs.tokenizer import tokenize
class SentenceStorerSvc(BaseModel):
- db: MarkovDatabase
+ db: MarkovDB
key_length: int = 2
end_tag: str = ""
@@ -24,7 +23,6 @@ class SentenceStorerSvc(BaseModel):
import nltk
nltk.download("punkt")
- nltk.download("punkt_tab")
logger.debug("Downloaded required punkt resource.")
sentences = sent_tokenize(stripped_message)
diff --git a/src/huesoporro/svc/store_quote.py b/src/huesoporro/svc/store_quote.py
new file mode 100644
index 0000000..fe56899
--- /dev/null
+++ b/src/huesoporro/svc/store_quote.py
@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+from src.huesoporro.infra.db import Database
+
+
+class QuoteStorerSvc(BaseModel):
+ db: Database
+
+ async def run(self, channel: str, quote: str, author: str):
+ await self.db.save_quote(channel, quote, author)
diff --git a/src/huesoporro/svc/store_settings.py b/src/huesoporro/svc/store_settings.py
new file mode 100644
index 0000000..e912d2d
--- /dev/null
+++ b/src/huesoporro/svc/store_settings.py
@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+from src.huesoporro.infra.db import Database
+from src.huesoporro.models import ChatbotSettings, User
+
+
+class ChatbotSettingsStorerSvc(BaseModel):
+ db: Database
+
+ async def run(
+ self, user: User, bot_settings: ChatbotSettings
+ ) -> dict[str, str | int | None] | None:
+ return await self.db.save_chatbot_settings(
+ user=user, chatbot_settings=bot_settings
+ )
diff --git a/src/huesoporro/svc/users_svcs.py b/src/huesoporro/svc/users_svcs.py
deleted file mode 100644
index a6267b1..0000000
--- a/src/huesoporro/svc/users_svcs.py
+++ /dev/null
@@ -1,127 +0,0 @@
-from uuid import UUID
-
-from loguru import logger
-from pydantic import BaseModel
-
-from huesoporro import utils
-from huesoporro.infra.authenticator import TwitchAuthenticator
-from huesoporro.infra.repos import UserRepo
-from huesoporro.models import TwitchAuth, User
-from huesoporro.settings import Settings
-
-
-class CreateUserSvc(BaseModel):
- user_repo: UserRepo
-
- async def run(self, user: User) -> User:
- """Create a new user in the system
-
- Args:
- user: User object to be created
-
- Returns:
- The created User with any system-generated fields populated
- """
- return await self.user_repo.create(user)
-
-
-class UpdateUserSvc(BaseModel):
- user_repo: UserRepo
-
- async def run(self, user: User) -> User:
- """Update an existing user in the system
-
- Args:
- user: User object with updated fields
-
- Returns:
- The updated User
-
- Raises:
- ValueError: If the user doesn't exist
- """
- user.last_updated_at = utils.get_utc_now()
- return await self.user_repo.update(user)
-
-
-class DeleteUserSvc(BaseModel):
- user_repo: UserRepo
-
- async def run(self, user: User) -> None:
- """Delete a user from the system
-
- Args:
- user: User object to be deleted
- """
- await self.user_repo.delete(user)
-
-
-class GetUserByIdSvc(BaseModel):
- user_repo: UserRepo
-
- async def run(self, user_id: UUID) -> User | None:
- """Retrieve a user by their ID
-
- Args:
- user_id: UUID of the user to retrieve
-
- Returns:
- User object if found, None otherwise
- """
- return await self.user_repo.get_by_id(user_id)
-
-
-class GetUserByUsernameSvc(BaseModel):
- user_repo: UserRepo
-
- async def run(self, username: str) -> User | None:
- """Retrieve a user by their username
-
- Args:
- username: Username of the user to retrieve
-
- Returns:
- User object if found, None otherwise
- """
- return await self.user_repo.get_by_username(username)
-
-
-class IsValidTokenSvc(BaseModel):
- authenticator: TwitchAuthenticator
-
- async def run(self, user: User) -> bool:
- return await self.authenticator.token_is_valid(user.twitch_access_token)
-
-
-class RefreshTokenSvc(BaseModel):
- twitch_authenticator: TwitchAuthenticator
-
- async def run(self, user: User) -> User:
- """Refresh a user's Twitch token
-
- Args:
- user: User object with the Twitch token to be refreshed
-
- Returns:
- The updated User with the refreshed Twitch token
- """
-
- logger.info(f"Refreshing token for user {user}")
- twitch_auth = await self.twitch_authenticator.refresh_token(
- user.twitch_refresh_token
- )
- user.twitch_access_token = twitch_auth.access_token # type: ignore[misc]
- user.twitch_refresh_token = twitch_auth.refresh_token # type: ignore[misc]
- return user
-
-
-class GetTwitchAuthByAuthCodeSvc(BaseModel):
- authenticator: TwitchAuthenticator
- s: Settings
-
- async def run(self, auth_code: str) -> TwitchAuth:
- auth = await self.authenticator.get_token(auth_code)
- username = auth.userinfo["preferred_username"]
- if username not in self.s.allowed_users:
- raise ValueError(f"User {username} is not allowed to use this bot")
- return auth
diff --git a/src/huesoporro/templates/header.html b/src/huesoporro/templates/header.html
index e6fe60a..7c1cfd9 100644
--- a/src/huesoporro/templates/header.html
+++ b/src/huesoporro/templates/header.html
@@ -2,24 +2,15 @@
-
+
-
-
-
-
Huesoporro
diff --git a/src/huesoporro/templates/index.html b/src/huesoporro/templates/index.html
index a2debe5..bdf08ee 100644
--- a/src/huesoporro/templates/index.html
+++ b/src/huesoporro/templates/index.html
@@ -2,16 +2,18 @@
-
-
+