diff --git a/.dockerignore b/.dockerignore
index a89b7d9..191381e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1 @@
-.git
-weights/
\ No newline at end of file
+.git
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d62f580..06e3308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ curl.md
cope2n-api/fwd_api/commands/init_database.py
/data
backup
+demo-ocr/
\ No newline at end of file
diff --git a/cope2n-ai-fi/.dockerignore b/cope2n-ai-fi/.dockerignore
index bf7ca8c..d38e621 100755
--- a/cope2n-ai-fi/.dockerignore
+++ b/cope2n-ai-fi/.dockerignore
@@ -4,5 +4,4 @@
__pycache__
DataBase/image_temp/
DataBase/json_temp/
-DataBase/template.db
-weights
\ No newline at end of file
+DataBase/template.db
\ No newline at end of file
diff --git a/cope2n-ai-fi/LICENSE b/cope2n-ai-fi/LICENSE
deleted file mode 100755
index f288702..0000000
--- a/cope2n-ai-fi/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 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 General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is 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. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- 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.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- 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 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. Use with the GNU Affero General Public License.
-
- 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 Affero 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 special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 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 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 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 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- 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 GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff --git a/cope2n-ai-fi/configs/sdsap_sbt/configs.py b/cope2n-ai-fi/configs/sdsap_sbt/configs.py
index 25d4d57..8d40ba0 100755
--- a/cope2n-ai-fi/configs/sdsap_sbt/configs.py
+++ b/cope2n-ai-fi/configs/sdsap_sbt/configs.py
@@ -29,7 +29,7 @@ kvu_model = {
"option": "sbt_v2",
"model": {
"pretrained_model_path": "/workspace/cope2n-ai-fi/weights/layoutxlm-base",
- "config": "/workspace/cope2n-ai-fi/weights/models/sdsvkvu/key_value_understanding_for_sbt-20231130-184433/base.yaml",
- "checkpoint": "/workspace/cope2n-ai-fi/weights/models/sdsvkvu/key_value_understanding_for_sbt-20231130-184433/checkpoints/best_model.pth"
+ "config": "/workspace/cope2n-ai-fi/weights/models/sdsvkvu/key_value_understanding_for_sbt-20231219-143837/base.yaml",
+ "checkpoint": "/workspace/cope2n-ai-fi/weights/models/sdsvkvu/key_value_understanding_for_sbt-20231219-143837/checkpoints/best_model.pth"
}
}
\ No newline at end of file
diff --git a/cope2n-ai-fi/modules/sdsvkie_ b/cope2n-ai-fi/modules/sdsvkie_
new file mode 160000
index 0000000..8349a89
--- /dev/null
+++ b/cope2n-ai-fi/modules/sdsvkie_
@@ -0,0 +1 @@
+Subproject commit 8349a89de7fd8c9e6958907047d16bdc23a77adf
diff --git a/cope2n-ai-fi/modules/sdsvkv_oldu b/cope2n-ai-fi/modules/sdsvkv_oldu
new file mode 160000
index 0000000..bdba044
--- /dev/null
+++ b/cope2n-ai-fi/modules/sdsvkv_oldu
@@ -0,0 +1 @@
+Subproject commit bdba044bb2eacac7c7cfe0e0f321196d03b681f6
diff --git a/cope2n-ai-fi/modules/sdsvkvu b/cope2n-ai-fi/modules/sdsvkvu
index bdba044..a471c10 160000
--- a/cope2n-ai-fi/modules/sdsvkvu
+++ b/cope2n-ai-fi/modules/sdsvkvu
@@ -1 +1 @@
-Subproject commit bdba044bb2eacac7c7cfe0e0f321196d03b681f6
+Subproject commit a471c1018c17cc917d1723776bae81f829450f95
diff --git a/cope2n-ai-fi/modules/sdsvtd_ b/cope2n-ai-fi/modules/sdsvtd_
new file mode 160000
index 0000000..a9a796f
--- /dev/null
+++ b/cope2n-ai-fi/modules/sdsvtd_
@@ -0,0 +1 @@
+Subproject commit a9a796f843f6ad99977a8dcba02d65fe75225574
diff --git a/cope2n-ai-fi/modules/sdsvtr_ b/cope2n-ai-fi/modules/sdsvtr_
new file mode 160000
index 0000000..2c788e9
--- /dev/null
+++ b/cope2n-ai-fi/modules/sdsvtr_
@@ -0,0 +1 @@
+Subproject commit 2c788e9e2d7fe369869d474fbb22426a4ca84590
diff --git a/cope2n-api/Dockerfile b/cope2n-api/Dockerfile
index 03e8ce6..18d6e3f 100755
--- a/cope2n-api/Dockerfile
+++ b/cope2n-api/Dockerfile
@@ -19,6 +19,6 @@ COPY --chown=${UID}:${GID} requirements.txt /app
WORKDIR /app
RUN pip install -r requirements.txt --no-cache-dir
-# COPY --chown=${UID}:${GID} . /app
+COPY --chown=${UID}:${GID} . /app
ENV TZ="Asia/Ho_Chi_Minh"
diff --git a/deploy_images.py b/deploy_images.py
new file mode 100644
index 0000000..5f1804f
--- /dev/null
+++ b/deploy_images.py
@@ -0,0 +1,107 @@
+import subprocess
+import hashlib
+import random
+import string
+import os
+import boto3
+from datetime import datetime
+
+BASH_FILE = './deploy_images.sh'
+S3_ENDPOINT = ""
+S3_ACCESS_KEY = "AKIA3AFPFVWZD77UACHE"
+S3_SECRET_KEY = "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"
+S3_BUCKET = "ocr-deployment-config"
+
+class MinioS3Client:
+ def __init__(self, access_key, secret_key, bucket_name, endpoint=""):
+ self.endpoint = endpoint
+ self.access_key = access_key
+ self.secret_key = secret_key
+ self.bucket_name = bucket_name
+ try:
+ if len(endpoint) > 0:
+ self.s3_client = boto3.client(
+ 's3',
+ endpoint_url=endpoint,
+ aws_access_key_id=access_key,
+ aws_secret_access_key=secret_key
+ )
+ else:
+ self.s3_client = boto3.client(
+ 's3',
+ aws_access_key_id=access_key,
+ aws_secret_access_key=secret_key
+ )
+ except Exception as e:
+ print(f"[WARM] Unable to create an s3 client, {e}")
+ self.s3_client = None
+
+ def update_object(self, s3_key, content):
+ try:
+ res = self.s3_client.put_object(
+ Bucket=self.bucket_name,
+ Key=s3_key,
+ Body=content
+ )
+ # print(f"Object '{s3_key}' updated in S3 with res: {res}")
+ return res
+ except Exception as e:
+ print(f"Error updating object in S3: {str(e)}")
+
+ def upload_file(self, local_file_path, s3_key):
+ try:
+ res = self.s3_client.upload_file(local_file_path, self.bucket_name, s3_key)
+ # print(f"File '{local_file_path}' uploaded to S3 with key '{s3_key}'")
+ return res
+ except Exception as e:
+ print(f"Error uploading file to S3: {str(e)}")
+
+ def download_file(self, s3_key, local_file_path):
+ try:
+ res = self.s3_client.download_file(self.bucket_name, s3_key, local_file_path)
+ # print(f"File '{s3_key}' downloaded from S3 to '{local_file_path}'")
+ return res
+ except Exception as e:
+ print(f"Error downloading file from S3: {str(e)}")
+
+def random_hash():
+ # Generate a random input
+ random_input = ''.join(random.choices(string.ascii_letters + string.digits, k=16))
+
+ # Generate the hash
+ hash_object = hashlib.sha256(random_input.encode())
+ random_hash = hash_object.hexdigest()
+ return random_hash
+
+def deploy():
+ # Define the variable
+ tag = str(random_hash()[:8])
+ now = datetime.now()
+ tag = tag + "_" + str(now.strftime("%d%m%y%H%M%S"))
+ print(tag)
+
+ # Execute the Bash script with the variable as a command-line argument
+ # os.chmod(BASH_FILE, 777)
+ os.chmod(BASH_FILE, 0o755)
+ subprocess.call([BASH_FILE, tag])
+
+ # TODO: Update to S3
+ s3_client = MinioS3Client(S3_ACCESS_KEY, S3_SECRET_KEY, S3_BUCKET, S3_ENDPOINT)
+ local_compose_file = f"./docker-compose_{tag}.yml"
+ local_env_file = f"./.env_{tag}"
+
+ s3_compose_file = f"docker-yaml-files/docker-compose_{tag}.yml"
+ s3_env_file = f"env-files/.env_{tag}"
+
+
+ print(f"[INFO]: Uploading compose and env file to s3...")
+ s3_client.upload_file(local_compose_file, s3_compose_file)
+ s3_client.upload_file(local_env_file, s3_env_file)
+
+ print(f"[INFO]: Deleting files...")
+ os.remove(local_compose_file)
+ os.remove(local_env_file)
+
+ print(f"[INFO]: Done !!!")
+if __name__=="__main__":
+ deploy()
\ No newline at end of file
diff --git a/deploy_images.sh b/deploy_images.sh
new file mode 100755
index 0000000..688822a
--- /dev/null
+++ b/deploy_images.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+tag=$1
+
+echo "[INFO] Tag received from Python: $tag"
+
+echo "[INFO] Pushing AI image with tag: $tag..."
+docker compose -f docker-compose-dev.yml build cope2n-fi-sbt
+docker tag sidp/cope2n-ai-fi-sbt:latest public.ecr.aws/v4n9y6r8/sidp/cope2n-ai-fi-sbt:${tag}
+docker push public.ecr.aws/v4n9y6r8/sidp/cope2n-ai-fi-sbt:${tag}
+
+echo "[INFO] Pushing BE image with tag: $tag..."
+docker compose -f docker-compose-dev.yml build be-ctel-sbt
+docker tag sidp/cope2n-be-fi-sbt:latest public.ecr.aws/v4n9y6r8/sidp/cope2n-be-fi-sbt:${tag}
+docker push public.ecr.aws/v4n9y6r8/sidp/cope2n-be-fi-sbt:${tag}
+
+echo "[INFO] Pushing FE image with tag: $tag..."
+docker compose -f docker-compose-dev.yml build fe-sbt
+docker tag sidp/cope2n-fe-fi-sbt:latest public.ecr.aws/v4n9y6r8/sidp/cope2n-fe-fi-sbt:${tag}
+docker push public.ecr.aws/v4n9y6r8/sidp/cope2n-fe-fi-sbt:${tag}
+
+cp ./docker-compose.yml ./docker-compose_${tag}.yml
+sed -i "s/{{tag}}/$tag/g" ./docker-compose_${tag}.yml
+cp .env .env_${tag}
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
new file mode 100755
index 0000000..96e890a
--- /dev/null
+++ b/docker-compose-dev.yml
@@ -0,0 +1,222 @@
+
+# TODO: use docker-compose extend: for compact purpose
+version: '3.0'
+networks:
+ ctel-sbt:
+ driver: bridge
+
+services:
+ cope2n-fi-sbt:
+ build:
+ context: cope2n-ai-fi
+ shm_size: 10gb
+ dockerfile: Dockerfile
+ shm_size: 10gb
+ restart: always
+ networks:
+ - ctel-sbt
+ privileged: true
+ image: sidp/cope2n-ai-fi-sbt
+ environment:
+ - CELERY_BROKER=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq-sbt:5672
+ - CUDA_VISIBLE_DEVICES=0
+ # volumes:
+ # - ./cope2n-ai-fi:/workspace/cope2n-ai-fi # for dev container only
+ working_dir: /workspace/cope2n-ai-fi
+ # deploy:
+ # resources:
+ # reservations:
+ # devices:
+ # - driver: nvidia
+ # count: 1
+ # capabilities: [gpu]
+ # command: bash -c "tail -f > /dev/null"
+ command: bash run.sh
+ deploy:
+ mode: replicated
+ replicas: 1
+ # Back-end services
+ be-ctel-sbt:
+ build:
+ context: cope2n-api
+ dockerfile: Dockerfile
+ image: sidp/cope2n-be-fi-sbt
+ environment:
+ - MEDIA_ROOT=${MEDIA_ROOT}
+ - DB_ENGINE=${DB_ENGINE}
+ - DB_SCHEMA=${DB_SCHEMA}
+ - DB_USER=${DB_USER}
+ - DB_PASSWORD=${DB_PASSWORD}
+ - DB_HOST=${DB_HOST}
+ - DB_PORT=${DB_PUBLIC_PORT}
+ - DEBUG=${DEBUG}
+ - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS}
+ - BASE_PORT=${BASE_PORT}
+ - CTEL_KEY=${CTEL_KEY}
+ - SECRET_KEY=${SECRET_KEY}
+ - DB_INTERNAL_KEY=${DB_INTERNAL_KEY}
+ - ALLOWED_HOSTS=${ALLOWED_HOSTS}
+ - BROKER_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq-sbt:5672
+ - BASE_URL=http://be-ctel-sbt:${BASE_PORT}
+ - BASE_UI_URL=http://fe:${VITE_PORT}
+ - AUTH_TOKEN_LIFE_TIME=${AUTH_TOKEN_LIFE_TIME}
+ - IMAGE_TOKEN_LIFE_TIME=${IMAGE_TOKEN_LIFE_TIME}
+ - INTERNAL_SDS_KEY=${INTERNAL_SDS_KEY}
+ - FI_USER_NAME=${FI_USER_NAME}
+ - FI_PASSWORD=${FI_PASSWORD}
+ - S3_ENDPOINT=${S3_ENDPOINT}
+ - S3_ACCESS_KEY=${S3_ACCESS_KEY}
+ - S3_SECRET_KEY=${S3_SECRET_KEY}
+ - S3_BUCKET_NAME=${S3_BUCKET_NAME}
+ restart: always
+ ports:
+ - 9000:9000
+ networks:
+ - ctel-sbt
+ volumes:
+ - ${HOST_MEDIA_FOLDER}:${MEDIA_ROOT}
+ - BE_static:/app/static
+ # - ./cope2n-api:/app
+ working_dir: /app
+ depends_on:
+ db-sbt:
+ condition: service_started
+ command: sh -c "chmod -R 777 /app/static; sleep 5; python manage.py collectstatic --no-input &&
+ python manage.py migrate &&
+ python manage.py compilemessages &&
+ gunicorn fwd.asgi:application -k uvicorn.workers.UvicornWorker --timeout 300 -b 0.0.0.0:9000" # pre-makemigrations on prod
+ minio:
+ image: minio/minio
+ environment:
+ - MINIO_ROOT_USER=${S3_ACCESS_KEY}
+ - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
+ - MINIO_ACCESS_KEY=${S3_ACCESS_KEY}
+ - MINIO_SECRET_KEY=${S3_SECRET_KEY}
+ volumes:
+ - ./data/minio_data:/data
+ networks:
+ - ctel-sbt
+ restart: always
+ command: server --address :9884 --console-address :9885 /data
+ profiles: ["local"]
+
+ createbuckets:
+ image: minio/mc
+ depends_on:
+ - minio
+ entrypoint: >
+ /bin/sh -c "
+ /usr/bin/mc alias set myminio http://minio:9884 ${S3_ACCESS_KEY} ${S3_SECRET_KEY};
+ /usr/bin/mc mb myminio/${S3_BUCKET_NAME};
+ /usr/bin/mc policy set public myminio/${S3_BUCKET_NAME};
+ exit 0;
+ "
+ networks:
+ - ctel-sbt
+ profiles: ["local"]
+
+ result-cache:
+ image: redis:6.2-alpine
+ restart: always
+ command: redis-server --save 20 1 --loglevel warning
+ networks:
+ - ctel-sbt
+
+ be-celery-sbt:
+ build:
+ context: cope2n-api
+ dockerfile: Dockerfile
+ image: sidp/cope2n-be-fi-sbt
+ environment:
+ - MEDIA_ROOT=${MEDIA_ROOT}
+ - PYTHONPATH=${PYTHONPATH}:/app # For import module
+ - PYTHONUNBUFFERED=1 # For show print log
+ - DB_ENGINE=${DB_ENGINE}
+ - DB_SCHEMA=${DB_SCHEMA}
+ - DB_USER=${DB_USER}
+ - DB_PASSWORD=${DB_PASSWORD}
+ - DB_HOST=${DB_HOST}
+ - DB_PORT=${DB_PUBLIC_PORT}
+ - BROKER_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq-sbt:5672
+ - BASE_UI_URL=http://fe:${VITE_PORT}
+ - DEBUG=${DEBUG}
+ - DB_INTERNAL_KEY=${DB_INTERNAL_KEY}
+ - IMAGE_TOKEN_LIFE_TIME=${IMAGE_TOKEN_LIFE_TIME}
+ - CTEL_KEY=${CTEL_KEY}
+ - SECRET_KEY=${SECRET_KEY}
+ - ALLOWED_HOSTS=${ALLOWED_HOSTS}
+ - S3_ENDPOINT=${S3_ENDPOINT}
+ - S3_ACCESS_KEY=${S3_ACCESS_KEY}
+ - S3_SECRET_KEY=${S3_SECRET_KEY}
+ - S3_BUCKET_NAME=${S3_BUCKET_NAME}
+ - BASE_URL=http://be-ctel-sbt:${BASE_PORT}
+ - REDIS_HOST=result-cache
+ - REDIS_PORT=6379
+ restart: always
+ networks:
+ - ctel-sbt
+ depends_on:
+ db-sbt:
+ condition: service_started
+ rabbitmq-sbt:
+ condition: service_started
+ volumes:
+ - ${HOST_MEDIA_FOLDER}:${MEDIA_ROOT}
+ # - ./cope2n-api:/app
+
+ working_dir: /app
+ command: sh -c "celery -A fwd_api.celery_worker.worker worker -l INFO -c 5"
+
+ # Back-end persistent
+ db-sbt:
+ restart: always
+ mem_reservation: 500m
+ image: postgres:14.7-alpine
+ volumes:
+ - ./data/postgres_data:/var/lib/postgresql/data
+ networks:
+ - ctel-sbt
+ environment:
+ - POSTGRES_USER=${DB_USER}
+ - POSTGRES_PASSWORD=${DB_PASSWORD}
+ - POSTGRES_DB=${DB_SCHEMA}
+
+ rabbitmq-sbt:
+ mem_reservation: 600m
+ restart: always
+ image: rabbitmq:3.10-alpine
+ working_dir: /workspace/cope2n-api
+ networks:
+ - ctel-sbt
+ environment:
+ - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
+ - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
+
+ # Front-end services
+ fe-sbt:
+ restart: always
+ build:
+ context: cope2n-fe
+ shm_size: 10gb
+ dockerfile: Dockerfile
+ image: sidp/cope2n-fe-fi-sbt
+ shm_size: 10gb
+ privileged: true
+ ports:
+ - 9881:80
+ depends_on:
+ be-ctel-sbt:
+ condition: service_started
+ be-celery-sbt:
+ condition: service_started
+ environment:
+ - VITE_PROXY=http://be-ctel-sbt:${BASE_PORT}
+ - VITE_API_BASE_URL=http://fe-sbt:80
+ volumes:
+ - BE_static:/backend-static
+ networks:
+ - ctel-sbt
+
+volumes:
+ db_data:
+ BE_static:
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index f5bbd8a..b677be1 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,68 +7,23 @@ networks:
services:
cope2n-fi-sbt:
- build:
- context: cope2n-ai-fi
- shm_size: 10gb
- dockerfile: Dockerfile
shm_size: 10gb
+ mem_limit: 10gb
restart: always
+ image: public.ecr.aws/v4n9y6r8/sidp/cope2n-ai-fi-sbt:{{tag}}
networks:
- ctel-sbt
privileged: true
environment:
- CELERY_BROKER=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq-sbt:5672
- - CUDA_VISIBLE_DEVICES=0
- volumes:
- - ./cope2n-ai-fi:/workspace/cope2n-ai-fi # for dev container only
working_dir: /workspace/cope2n-ai-fi
- # deploy:
- # resources:
- # reservations:
- # devices:
- # - driver: nvidia
- # count: 1
- # capabilities: [gpu]
- # command: bash -c "tail -f > /dev/null"
command: bash run.sh
deploy:
mode: replicated
- replicas: 1
-
- cope2n-fi-sbt-2:
- build:
- context: cope2n-ai-fi
- shm_size: 10gb
- dockerfile: Dockerfile
- shm_size: 10gb
- restart: always
- networks:
- - ctel-sbt
- privileged: true
- environment:
- - CELERY_BROKER=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbitmq-sbt:5672
- - CUDA_VISIBLE_DEVICES=0
- volumes:
- - ./cope2n-ai-fi:/workspace/cope2n-ai-fi # for dev container only
- working_dir: /workspace/cope2n-ai-fi
- # deploy:
- # resources:
- # reservations:
- # devices:
- # - driver: nvidia
- # count: 1
- # capabilities: [gpu]
- # command: bash -c "tail -f > /dev/null"
- command: bash run.sh
- deploy:
- mode: replicated
- replicas: 1
+ replicas: 2
# Back-end services
be-ctel-sbt:
- build:
- context: cope2n-api
- dockerfile: Dockerfile
environment:
- MEDIA_ROOT=${MEDIA_ROOT}
- DB_ENGINE=${DB_ENGINE}
@@ -97,12 +52,15 @@ services:
- S3_SECRET_KEY=${S3_SECRET_KEY}
- S3_BUCKET_NAME=${S3_BUCKET_NAME}
restart: always
+ mem_limit: 10gb
+ image: public.ecr.aws/v4n9y6r8/sidp/cope2n-be-fi-sbt:{{tag}}
networks:
- ctel-sbt
volumes:
- ${HOST_MEDIA_FOLDER}:${MEDIA_ROOT}
- ./data/static:/app/static
- ./cope2n-api:/app
+
working_dir: /app
depends_on:
db-sbt:
@@ -144,14 +102,12 @@ services:
result-cache:
image: redis:6.2-alpine
restart: always
+ mem_limit: 10gb
command: redis-server --save 20 1 --loglevel warning
networks:
- ctel-sbt
be-celery-sbt:
- build:
- context: cope2n-api
- dockerfile: Dockerfile
environment:
- MEDIA_ROOT=${MEDIA_ROOT}
- PYTHONPATH=${PYTHONPATH}:/app # For import module
@@ -178,6 +134,7 @@ services:
- REDIS_HOST=result-cache
- REDIS_PORT=6379
restart: always
+ image: public.ecr.aws/v4n9y6r8/sidp/cope2n-be-fi-sbt:{{tag}}
networks:
- ctel-sbt
depends_on:
@@ -187,7 +144,6 @@ services:
condition: service_started
volumes:
- ${HOST_MEDIA_FOLDER}:${MEDIA_ROOT}
- - ./cope2n-api:/app
working_dir: /app
command: sh -c "celery -A fwd_api.celery_worker.worker worker -l INFO -c 8"
@@ -205,6 +161,7 @@ services:
- POSTGRES_USER=${DB_USER}
- POSTGRES_PASSWORD=${DB_PASSWORD}
- POSTGRES_DB=${DB_SCHEMA}
+ profiles: ["local"]
rabbitmq-sbt:
mem_reservation: 600m
@@ -220,11 +177,9 @@ services:
# Front-end services
fe-sbt:
restart: always
- build:
- context: cope2n-fe
- shm_size: 10gb
- dockerfile: Dockerfile
+ mem_limit: 4gb
shm_size: 10gb
+ image: public.ecr.aws/v4n9y6r8/sidp/cope2n-fe-fi-sbt:{{tag}}
privileged: true
ports:
- ${SIDP_SERVICE_PORT:-9881}:80
@@ -243,3 +198,4 @@ services:
volumes:
db_data:
+ BE_static:
diff --git a/speedtest_sync_periodically.py b/speedtest_sync_periodically.py
new file mode 100644
index 0000000..abc58a2
--- /dev/null
+++ b/speedtest_sync_periodically.py
@@ -0,0 +1,163 @@
+import requests
+import time
+import argparse
+import multiprocessing
+import tqdm
+import random
+import traceback
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--host", dest="host", default="https://sbt.idp.sdsrv.ai", required=False)
+parser.add_argument("-u", "--username", help="Username to connect to server", required=True)
+parser.add_argument("-p", "--password", help="Password to connect to server", required=True)
+parser.add_argument("--num_requests", type=int, help="Number of requests", required=False, default=100)
+parser.add_argument("--num_workers", type=int, help="Number of workers", required=False, default=3)
+parser.add_argument("--checking_interval", type=float, help="Interval result checking time", required=False, default=0.5)
+args = parser.parse_args()
+
+PROCESSING_TIMEOUT = 60
+
+
+# =================================================================
+# GET THE TOKEN
+response = requests.post(f'{args.host}/api/ctel/login/', json={
+ 'username': args.username,
+ 'password': args.password
+})
+try:
+ token = response.json()['token']
+except:
+ print("Failed to login")
+ print(response.content)
+# After the login, store the token in the memory (RAM) or DB
+# Re-login to issue a new token after 6 days.
+# =================================================================
+
+def process_file(data):
+ files, token = data
+ num_files = len(files)
+ files.append(
+ ('processType', (None, 12)),
+ )
+ # =================================================================
+ # UPLOAD THE FILE
+ start_time = time.time()
+ try:
+ response = requests.post(f'{args.host}/api/ctel/images/process_sync/', headers={
+ 'Authorization': token,
+ }, files=files, timeout=300)
+ except requests.exceptions.Timeout:
+ print("Timeout occurred while uploading")
+ return {
+ "success": False,
+ "status": "timeout",
+ "upload_time": 0,
+ "process_time": 0,
+ "num_files": 0,
+ }
+ except Exception as e:
+ print(e)
+ traceback.print_exc()
+ print("Unknown exception occurred while uploading")
+ return {
+ "success": False,
+ "status": "unknown error",
+ "upload_time": 0,
+ "process_time": 0,
+ "num_files": 0,
+ }
+ end_time = time.time()
+ upload_time = end_time - start_time
+ # =================================================================
+
+ try:
+ data = response.json()
+ data.pop("files", None)
+ print(data)
+ except:
+ print(response.content)
+ return {
+ "success": False,
+ "status": "timeout",
+ "upload_time": 0,
+ "process_time": 0,
+ "num_files": 0,
+ }
+ return {
+ "success": True,
+ "status": 200,
+ "upload_time": upload_time,
+ "process_time": upload_time,
+ "num_files": num_files,
+ }
+
+# invoice_files = [
+# ('invoice_file', ('invoice.pdf', open("test_samples/20220303025923NHNE_20220222_Starhub_Order_Confirmation_by_Email.pdf", "rb").read())),
+# ]
+invoice_files = [
+ ('invoice_file', ('invoice.jpg', open("test_samples/sbt/invoice.jpg", "rb").read())),
+]
+imei_files = [
+ ('imei_files', ("test_samples/sbt/imei1.jpg", open("test_samples/sbt/imei1.jpg", "rb").read())),
+ ('imei_files', ("test_samples/sbt/imei2.jpg", open("test_samples/sbt/imei2.jpg", "rb").read())),
+]
+# imei_files = [
+# ('imei_files', ("test_samples/sbt/imei1.jpg", open("test_samples/sbt/imei1.jpg", "rb").read())),
+# ('imei_files', ("test_samples/sbt/imei2.jpg", open("test_samples/sbt/imei2.jpg", "rb").read())),
+# ]
+def get_imei_files():
+ # num_files = random.randint(1, len(imei_files) + 1)
+ num_files = 2
+ print("Num imeis", num_files)
+ files = imei_files[:num_files]
+ # print("Num of imei files:", len(files))
+ return files
+def get_files():
+ return invoice_files + get_imei_files()
+def gen_input(num_input):
+ last = time.time()
+ rate = 60/(12/3)
+ for _ in range(num_input):
+ interval = rate-(time.time()-last)
+ if interval > 0:
+ print(f"[INFO]: sleep for {interval}")
+ time.sleep(interval)
+ last = time.time()
+ yield (get_files(), token)
+pool = multiprocessing.Pool(processes=args.num_workers*5)
+results = []
+for result in tqdm.tqdm(pool.imap_unordered(process_file, gen_input(num_input=args.num_requests)), total=args.num_requests):
+ results.append(result)
+
+print("## TEST REPORT #################################")
+print("Number of requests: {}".format(args.num_requests))
+print("Number of concurrent requests: {}".format(args.num_workers))
+print("Number of files: 1 invoice, 1-5 imei files (random)")
+print("Query time interval for result: {:.3f}s ".format(args.checking_interval))
+print("--------------------------------------")
+print("SUCCESS RATE")
+counter = {}
+for result in results:
+ counter[result["status"]] = counter.get(result["status"], 0) + 1
+total_requests = sum(counter.values())
+print("Success rate: {}".format(counter.get(200, 0) / total_requests if total_requests > 0 else -1))
+print("Statuses:", counter)
+print("--------------------------------------")
+print("TIME BY REQUEST")
+uploading_time = [x["upload_time"] for x in results if x["success"]]
+if len(uploading_time) == 0:
+ print("No valid uploading time")
+ print("Check the results!")
+processing_time = [x["process_time"] for x in results if x["success"]]
+print("Uploading time (Avg / Min / Max): {:.3f}s {:.3f}s {:.3f}s".format(sum(uploading_time) / len(uploading_time), min(uploading_time), max(uploading_time)))
+print("Processing time (Avg / Min / Max): {:.3f}s {:.3f}s {:.3f}s".format(sum(processing_time) / len(processing_time), min(processing_time), max(processing_time)))
+print("--------------------------------------")
+print("TIME BY IMAGE")
+uploading_time = [x["upload_time"] for x in results if x["success"]]
+processing_time = [x["process_time"] for x in results if x["success"]]
+num_images = sum(x["num_files"] for x in results if x["success"])
+print("Total images:", num_images)
+print("Uploading time: {:.3f}s".format(sum(uploading_time) / num_images))
+print("Processing time: {:.3f}s".format(sum(processing_time) / num_images))
+print("--------------------------------------")