diff --git a/libs/LICENSE b/libs/LICENSE
new file mode 100644
index 00000000..e72bfdda
--- /dev/null
+++ b/libs/LICENSE
@@ -0,0 +1,674 @@
+ 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
+.
\ No newline at end of file
diff --git a/libs/README.md b/libs/README.md
new file mode 100644
index 00000000..eece6f89
--- /dev/null
+++ b/libs/README.md
@@ -0,0 +1,4 @@
+# LangBot/libs
+
+LangBot 项目下的 libs 目录下的所有代码均遵循本目录下的许可证约束。
+您在使用、修改、分发本目录下的代码时,需要遵守其中包含的条款。
diff --git a/libs/dify_service_api/README.md b/libs/dify_service_api/README.md
new file mode 100644
index 00000000..a94aefe7
--- /dev/null
+++ b/libs/dify_service_api/README.md
@@ -0,0 +1,3 @@
+# Dify Service API Python SDK
+
+这个 SDK 尚不完全支持 Dify Service API 的所有功能。
diff --git a/libs/dify_service_api/__init__.py b/libs/dify_service_api/__init__.py
new file mode 100644
index 00000000..5f178abb
--- /dev/null
+++ b/libs/dify_service_api/__init__.py
@@ -0,0 +1,2 @@
+from .v1 import client
+from .v1 import errors
\ No newline at end of file
diff --git a/libs/dify_service_api/test.py b/libs/dify_service_api/test.py
new file mode 100644
index 00000000..4c2662fa
--- /dev/null
+++ b/libs/dify_service_api/test.py
@@ -0,0 +1,44 @@
+from v1 import client
+
+import asyncio
+
+import os
+import json
+
+
+class TestDifyClient:
+ async def test_chat_messages(self):
+ cln = client.AsyncDifyServiceClient(api_key=os.getenv("DIFY_API_KEY"), base_url=os.getenv("DIFY_BASE_URL"))
+
+ resp = await cln.chat_messages(inputs={}, query="Who are you?", user="test")
+ print(json.dumps(resp, ensure_ascii=False, indent=4))
+
+ async def test_upload_file(self):
+ cln = client.AsyncDifyServiceClient(api_key=os.getenv("DIFY_API_KEY"), base_url=os.getenv("DIFY_BASE_URL"))
+
+ file_bytes = open("img.png", "rb").read()
+
+ print(type(file_bytes))
+
+ file = ("img2.png", file_bytes, "image/png")
+
+ resp = await cln.upload_file(file=file, user="test")
+ print(json.dumps(resp, ensure_ascii=False, indent=4))
+
+ async def test_workflow_run(self):
+ cln = client.AsyncDifyServiceClient(api_key=os.getenv("DIFY_API_KEY"), base_url=os.getenv("DIFY_BASE_URL"))
+
+ # resp = await cln.workflow_run(inputs={}, user="test")
+ # # print(json.dumps(resp, ensure_ascii=False, indent=4))
+ # print(resp)
+ chunks = []
+
+ ignored_events = ['text_chunk']
+ async for chunk in cln.workflow_run(inputs={}, user="test"):
+ if chunk['event'] in ignored_events:
+ continue
+ chunks.append(chunk)
+ print(json.dumps(chunks, ensure_ascii=False, indent=4))
+
+if __name__ == "__main__":
+ asyncio.run(TestDifyClient().test_workflow_run())
diff --git a/libs/dify_service_api/v1/__init__.py b/libs/dify_service_api/v1/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libs/dify_service_api/v1/client.py b/libs/dify_service_api/v1/client.py
new file mode 100644
index 00000000..91b60052
--- /dev/null
+++ b/libs/dify_service_api/v1/client.py
@@ -0,0 +1,125 @@
+from __future__ import annotations
+
+import httpx
+import typing
+import json
+
+from .errors import DifyAPIError
+
+
+class AsyncDifyServiceClient:
+ """Dify Service API 客户端"""
+
+ api_key: str
+ base_url: str
+
+ def __init__(
+ self,
+ api_key: str,
+ base_url: str = "https://api.dify.ai/v1",
+ ) -> None:
+ self.api_key = api_key
+ self.base_url = base_url
+
+ async def chat_messages(
+ self,
+ inputs: dict[str, typing.Any],
+ query: str,
+ user: str,
+ response_mode: str = "blocking", # 当前不支持 streaming
+ conversation_id: str = "",
+ files: list[dict[str, typing.Any]] = [],
+ timeout: float = 30.0,
+ ) -> dict[str, typing.Any]:
+ """发送消息"""
+ if response_mode != "blocking":
+ raise DifyAPIError("当前仅支持 blocking 模式")
+
+ async with httpx.AsyncClient(
+ base_url=self.base_url,
+ trust_env=True,
+ timeout=timeout,
+ ) as client:
+ response = await client.post(
+ "/chat-messages",
+ headers={"Authorization": f"Bearer {self.api_key}", "Content-Type": "application/json"},
+ json={
+ "inputs": inputs,
+ "query": query,
+ "user": user,
+ "response_mode": response_mode,
+ "conversation_id": conversation_id,
+ "files": files,
+ },
+ )
+
+ if response.status_code != 200:
+ raise DifyAPIError(f"{response.status_code} {response.text}")
+
+ return response.json()
+
+ async def workflow_run(
+ self,
+ inputs: dict[str, typing.Any],
+ user: str,
+ response_mode: str = "streaming", # 当前不支持 blocking
+ files: list[dict[str, typing.Any]] = [],
+ timeout: float = 30.0,
+ ) -> typing.AsyncGenerator[dict[str, typing.Any], None]:
+ """运行工作流"""
+ if response_mode != "streaming":
+ raise DifyAPIError("当前仅支持 streaming 模式")
+
+ async with httpx.AsyncClient(
+ base_url=self.base_url,
+ trust_env=True,
+ timeout=timeout,
+ ) as client:
+
+ async with client.stream(
+ "POST",
+ "/workflows/run",
+ headers={"Authorization": f"Bearer {self.api_key}", "Content-Type": "application/json"},
+ json={
+ "inputs": inputs,
+ "user": user,
+ "response_mode": response_mode,
+ "files": files,
+ },
+ ) as r:
+ async for chunk in r.aiter_lines():
+ if chunk.strip() == "":
+ continue
+ if chunk.startswith("data:"):
+ yield json.loads(chunk[5:])
+
+ async def upload_file(
+ self,
+ file: httpx._types.FileTypes,
+ user: str,
+ timeout: float = 30.0,
+ ) -> str:
+ """上传文件"""
+ # curl -X POST 'http://dify.rockchin.top/v1/files/upload' \
+ # --header 'Authorization: Bearer {api_key}' \
+ # --form 'file=@localfile;type=image/[png|jpeg|jpg|webp|gif] \
+ # --form 'user=abc-123'
+ async with httpx.AsyncClient(
+ base_url=self.base_url,
+ trust_env=True,
+ timeout=timeout,
+ ) as client:
+ # multipart/form-data
+ response = await client.post(
+ "/files/upload",
+ headers={"Authorization": f"Bearer {self.api_key}"},
+ files={
+ "file": file,
+ "user": (None, user),
+ },
+ )
+
+ if response.status_code != 201:
+ raise DifyAPIError(f"{response.status_code} {response.text}")
+
+ return response.json()
diff --git a/libs/dify_service_api/v1/client_test.py b/libs/dify_service_api/v1/client_test.py
new file mode 100644
index 00000000..58ef53b4
--- /dev/null
+++ b/libs/dify_service_api/v1/client_test.py
@@ -0,0 +1,17 @@
+from . import client
+
+import asyncio
+
+import os
+
+
+class TestDifyClient:
+ async def test_chat_messages(self):
+ cln = client.DifyClient(api_key=os.getenv("DIFY_API_KEY"))
+
+ resp = await cln.chat_messages(inputs={}, query="Who are you?", user_id="test")
+ print(resp)
+
+
+if __name__ == "__main__":
+ asyncio.run(TestDifyClient().test_chat_messages())
diff --git a/libs/dify_service_api/v1/errors.py b/libs/dify_service_api/v1/errors.py
new file mode 100644
index 00000000..0b71fc55
--- /dev/null
+++ b/libs/dify_service_api/v1/errors.py
@@ -0,0 +1,6 @@
+class DifyAPIError(Exception):
+ """Dify API 请求失败"""
+
+ def __init__(self, message: str):
+ self.message = message
+ super().__init__(self.message)
diff --git a/pkg/core/entities.py b/pkg/core/entities.py
index 5156d8ca..712835b1 100644
--- a/pkg/core/entities.py
+++ b/pkg/core/entities.py
@@ -91,7 +91,7 @@ class Config:
class Conversation(pydantic.BaseModel):
- """对话,包含于 Session 中,一个 Session 可以有多个历史 Conversation,但只有一个当前使用的 Conversation"""
+ """对话,包含于 Session 中,一个 Session 可以有多个历史 Conversation,但只有一个当前使用的 Conversation"""
prompt: sysprompt_entities.Prompt
@@ -105,6 +105,9 @@ class Conversation(pydantic.BaseModel):
use_funcs: typing.Optional[list[tools_entities.LLMFunction]]
+ uuid: typing.Optional[str] = None
+ """该对话的 uuid,在创建时不会自动生成。而是当使用 Dify API 等由外部管理对话信息的服务时,用于绑定外部的会话。具体如何使用,取决于 Runner。"""
+
class Session(pydantic.BaseModel):
"""会话,一个 Session 对应一个 {launcher_type.value}_{launcher_id}"""
diff --git a/pkg/core/migrations/m016_dify_service_api.py b/pkg/core/migrations/m016_dify_service_api.py
new file mode 100644
index 00000000..92e8b6ee
--- /dev/null
+++ b/pkg/core/migrations/m016_dify_service_api.py
@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("dify-service-api-config", 16)
+class DifyServiceAPICfgMigration(migration.Migration):
+ """迁移"""
+
+ async def need_migrate(self) -> bool:
+ """判断当前环境是否需要运行此迁移"""
+ return 'dify-service-api' not in self.ap.provider_cfg.data
+
+ async def run(self):
+ """执行迁移"""
+ self.ap.provider_cfg.data['dify-service-api'] = {
+ "base-url": "https://api.dify.ai/v1",
+ "app-type": "chat",
+ "chat": {
+ "api-key": "sk-1234567890"
+ },
+ "workflow": {
+ "api-key": "sk-1234567890",
+ "output-key": "summary"
+ }
+ }
+
+ await self.ap.provider_cfg.dump_config()
diff --git a/pkg/core/stages/migrate.py b/pkg/core/stages/migrate.py
index 8950ca35..ec70a2ab 100644
--- a/pkg/core/stages/migrate.py
+++ b/pkg/core/stages/migrate.py
@@ -7,7 +7,7 @@
from ..migrations import m001_sensitive_word_migration, m002_openai_config_migration, m003_anthropic_requester_cfg_completion, m004_moonshot_cfg_completion
from ..migrations import m005_deepseek_cfg_completion, m006_vision_config, m007_qcg_center_url, m008_ad_fixwin_config_migrate, m009_msg_truncator_cfg
from ..migrations import m010_ollama_requester_config, m011_command_prefix_config, m012_runner_config, m013_http_api_config, m014_force_delay_config
-from ..migrations import m015_gitee_ai_config
+from ..migrations import m015_gitee_ai_config, m016_dify_service_api
@stage.stage_class("MigrationStage")
diff --git a/pkg/provider/runnermgr.py b/pkg/provider/runnermgr.py
index 772c43b8..f45abfa4 100644
--- a/pkg/provider/runnermgr.py
+++ b/pkg/provider/runnermgr.py
@@ -4,7 +4,7 @@
from ..core import app
from .runners import localagent
-from .runners import difyapi
+from .runners import difysvapi
class RunnerManager:
diff --git a/pkg/provider/runners/difyapi.py b/pkg/provider/runners/difyapi.py
index c7139bc4..4b75a2ef 100644
--- a/pkg/provider/runners/difyapi.py
+++ b/pkg/provider/runners/difyapi.py
@@ -1,205 +1,205 @@
-from __future__ import annotations
-
-import json
-import typing
-import aiohttp
-
-from .. import runner
-from ...core import app, entities as core_entities
-from .. import entities as llm_entities
-
-api_url = "请求地址/v1"
-api_key = "请求key"
-user_name = "dify-plugin"
-# 需要在dify的自定义字段中另外设置context和system_prompt
-headers = {
- "Authorization": f"Bearer {api_key}",
- "Content-Type": "application/json"
-}
-
-
-def get_content_text(content):
- if isinstance(content, list):
- return " ".join(str(element) if element.image_url is None else " " for element in content)
- elif isinstance(content, str):
- return content
- else:
- return ""
-
-
-@runner.runner_class("difyapi")
-class DifyAgentRunner(runner.RequestRunner):
- """Dify API 对话请求器
- """
-
- async def run(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
- """运行请求"""
- await query.use_model.requester.preprocess(query)
-
- # 构建系统提示词
- prompt_messages = query.prompt.messages.copy()
- system_prompt = "\n".join(
- f"{msg.role}: {get_content_text(msg.content)}" for msg in prompt_messages if msg.content
- )
-
- # 构建上下文
- previous_messages = query.messages.copy()
- user_message = [query.user_message]
-
- # 检查 user_message 中的 image_url
- image_urls = [element.image_url.url for element in query.user_message.content if element.type == 'image_url' and element.image_url is not None]
-
- if len(image_urls) > 10:
- raise ValueError("仅可包含最多10张图片")
-
- data = {}
- if image_urls:
- data["files"] = [
- {
- "type": "image",
- "transfer_method": "remote_url",
- "url": url
- } for url in image_urls
- ]
- else:
- data["files"] = []
-
- # 继续处理其他逻辑
- all_messages = previous_messages + user_message
-
- context = "\n".join(
- f"{msg.role}: {get_content_text(msg.content)}" for msg in all_messages if msg.content
- )
-
- # 构建请求数据
- data.update({
- "inputs": {
- "context": context,
- "system_prompt": system_prompt,
- "files": data["files"]
- },
- "query": get_content_text(query.user_message.content),
- "response_mode": "blocking",
- "conversation_id": "",
- "user": user_name
+# from __future__ import annotations
+
+# import json
+# import typing
+# import aiohttp
+
+# from .. import runner
+# from ...core import app, entities as core_entities
+# from .. import entities as llm_entities
+
+# api_url = "请求地址/v1"
+# api_key = "请求key"
+# user_name = "dify-plugin"
+# # 需要在dify的自定义字段中另外设置context和system_prompt
+# headers = {
+# "Authorization": f"Bearer {api_key}",
+# "Content-Type": "application/json"
+# }
+
+
+# def get_content_text(content):
+# if isinstance(content, list):
+# return " ".join(str(element) if element.image_url is None else " " for element in content)
+# elif isinstance(content, str):
+# return content
+# else:
+# return ""
+
+
+# @runner.runner_class("dify-api")
+# class DifyAPIRunner(runner.RequestRunner):
+# """Dify API 对话请求器
+# """
+
+# async def run(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
+# """运行请求"""
+# await query.use_model.requester.preprocess(query)
+
+# # 构建系统提示词
+# prompt_messages = query.prompt.messages.copy()
+# system_prompt = "\n".join(
+# f"{msg.role}: {get_content_text(msg.content)}" for msg in prompt_messages if msg.content
+# )
+
+# # 构建上下文
+# previous_messages = query.messages.copy()
+# user_message = [query.user_message]
+
+# # 检查 user_message 中的 image_url
+# image_urls = [element.image_url.url for element in query.user_message.content if element.type == 'image_url' and element.image_url is not None]
+
+# if len(image_urls) > 10:
+# raise ValueError("仅可包含最多10张图片")
+
+# data = {}
+# if image_urls:
+# data["files"] = [
+# {
+# "type": "image",
+# "transfer_method": "remote_url",
+# "url": url
+# } for url in image_urls
+# ]
+# else:
+# data["files"] = []
+
+# # 继续处理其他逻辑
+# all_messages = previous_messages + user_message
+
+# context = "\n".join(
+# f"{msg.role}: {get_content_text(msg.content)}" for msg in all_messages if msg.content
+# )
+
+# # 构建请求数据
+# data.update({
+# "inputs": {
+# "context": context,
+# "system_prompt": system_prompt,
+# "files": data["files"]
+# },
+# "query": get_content_text(query.user_message.content),
+# "response_mode": "blocking",
+# "conversation_id": "",
+# "user": user_name
- })
-
- async with aiohttp.ClientSession() as session:
- try:
- async with session.post(api_url + "/chat-messages", headers=headers, json=data) as response:
- response_data = await response.json()
- response.raise_for_status()
-
- # 处理响应数据
- content_elements = [llm_entities.ContentElement.from_text(response_data.get("answer", ""))]
-
- msg = llm_entities.Message(
- role="assistant",
- content=content_elements
- )
- yield msg
- except aiohttp.ClientResponseError as http_err:
- if response.status == 404:
- error_message = "对话不存在"
- elif response.status == 400:
- error_code = response_data.get("code")
- if error_code == "invalid_param":
- error_message = "传入参数异常"
- elif error_code == "app_unavailable":
- error_message = "App 配置不可用"
- elif error_code == "provider_not_initialize":
- error_message = "无可用模型凭据配置"
- elif error_code == "provider_quota_exceeded":
- error_message = "模型调用额度不足"
- elif error_code == "model_currently_not_support":
- error_message = "当前模型不可用"
- elif error_code == "completion_request_error":
- error_message = "文本生成失败"
- elif response.status == 500:
- error_message = "服务内部异常"
- else:
- error_message = f"HTTP error occurred: {http_err}"
- raise ValueError(error_message)
- except Exception as err:
- raise ValueError(f"An error occurred: {err}")
-
-
-@runner.runner_class("local-agent")
-class LocalAgentRunner(runner.RequestRunner):
- """本地Agent请求运行器
- """
-
- async def run(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
- """运行请求
- """
- await query.use_model.requester.preprocess(query)
-
- pending_tool_calls = []
-
- req_messages = query.prompt.messages.copy() + query.messages.copy() + [query.user_message]
-
- # 首次请求
- try:
- msg = await query.use_model.requester.call(query.use_model, req_messages, query.use_funcs)
- if "answer" not in msg.content:
- raise ValueError("请求失败:返回内容不含answer")
- except Exception as e:
- err_msg = llm_entities.Message(
- role="system", content=f"请求失败:{e}"
- )
- yield err_msg
- return
-
- yield msg
-
- pending_tool_calls = msg.tool_calls
-
- req_messages.append(msg)
-
- # 持续请求,只要还有待处理的工具调用就继续处理调用
- while pending_tool_calls:
- for tool_call in pending_tool_calls:
- try:
- func = tool_call.function
+# })
+
+# async with aiohttp.ClientSession() as session:
+# try:
+# async with session.post(api_url + "/chat-messages", headers=headers, json=data) as response:
+# response_data = await response.json()
+# response.raise_for_status()
+
+# # 处理响应数据
+# content_elements = [llm_entities.ContentElement.from_text(response_data.get("answer", ""))]
+
+# msg = llm_entities.Message(
+# role="assistant",
+# content=content_elements
+# )
+# yield msg
+# except aiohttp.ClientResponseError as http_err:
+# if response.status == 404:
+# error_message = "对话不存在"
+# elif response.status == 400:
+# error_code = response_data.get("code")
+# if error_code == "invalid_param":
+# error_message = "传入参数异常"
+# elif error_code == "app_unavailable":
+# error_message = "App 配置不可用"
+# elif error_code == "provider_not_initialize":
+# error_message = "无可用模型凭据配置"
+# elif error_code == "provider_quota_exceeded":
+# error_message = "模型调用额度不足"
+# elif error_code == "model_currently_not_support":
+# error_message = "当前模型不可用"
+# elif error_code == "completion_request_error":
+# error_message = "文本生成失败"
+# elif response.status == 500:
+# error_message = "服务内部异常"
+# else:
+# error_message = f"HTTP error occurred: {http_err}"
+# raise ValueError(error_message)
+# except Exception as err:
+# raise ValueError(f"An error occurred: {err}")
+
+
+# # @runner.runner_class("local-agent")
+# # class LocalAgentRunner(runner.RequestRunner):
+# # """本地Agent请求运行器
+# # """
+
+# # async def run(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
+# # """运行请求
+# # """
+# # await query.use_model.requester.preprocess(query)
+
+# # pending_tool_calls = []
+
+# # req_messages = query.prompt.messages.copy() + query.messages.copy() + [query.user_message]
+
+# # # 首次请求
+# # try:
+# # msg = await query.use_model.requester.call(query.use_model, req_messages, query.use_funcs)
+# # if "answer" not in msg.content:
+# # raise ValueError("请求失败:返回内容不含answer")
+# # except Exception as e:
+# # err_msg = llm_entities.Message(
+# # role="system", content=f"请求失败:{e}"
+# # )
+# # yield err_msg
+# # return
+
+# # yield msg
+
+# # pending_tool_calls = msg.tool_calls
+
+# # req_messages.append(msg)
+
+# # # 持续请求,只要还有待处理的工具调用就继续处理调用
+# # while pending_tool_calls:
+# # for tool_call in pending_tool_calls:
+# # try:
+# # func = tool_call.function
- parameters = json.loads(func.arguments)
+# # parameters = json.loads(func.arguments)
- func_ret = await self.ap.tool_mgr.execute_func_call(
- query, func.name, parameters
- )
+# # func_ret = await self.ap.tool_mgr.execute_func_call(
+# # query, func.name, parameters
+# # )
- msg = llm_entities.Message(
- role="tool", content=json.dumps(func_ret, ensure_ascii=False), tool_call_id=tool_call.id
- )
+# # msg = llm_entities.Message(
+# # role="tool", content=json.dumps(func_ret, ensure_ascii=False), tool_call_id=tool_call.id
+# # )
- yield msg
+# # yield msg
- req_messages.append(msg)
- except Exception as e:
- # 工具调用出错,添加一个报错信息到 req_messages
- err_msg = llm_entities.Message(
- role="tool", content=f"err: {e}", tool_call_id=tool_call.id
- )
+# # req_messages.append(msg)
+# # except Exception as e:
+# # # 工具调用出错,添加一个报错信息到 req_messages
+# # err_msg = llm_entities.Message(
+# # role="tool", content=f"err: {e}", tool_call_id=tool_call.id
+# # )
- yield err_msg
+# # yield err_msg
- req_messages.append(err_msg)
+# # req_messages.append(err_msg)
- # 处理完所有调用,再次请求
- try:
- msg = await query.use_model.requester.call(query.use_model, req_messages, query.use_funcs)
- if "answer" not in msg.content:
- raise ValueError("请求失败:返回内容不含answer")
- except Exception as e:
- err_msg = llm_entities.Message(
- role="system", content=f"请求失败:{e}"
- )
- yield err_msg
- return
+# # # 处理完所有调用,再次请求
+# # try:
+# # msg = await query.use_model.requester.call(query.use_model, req_messages, query.use_funcs)
+# # if "answer" not in msg.content:
+# # raise ValueError("请求失败:返回内容不含answer")
+# # except Exception as e:
+# # err_msg = llm_entities.Message(
+# # role="system", content=f"请求失败:{e}"
+# # )
+# # yield err_msg
+# # return
- yield msg
+# # yield msg
- pending_tool_calls = msg.tool_calls
+# # pending_tool_calls = msg.tool_calls
- req_messages.append(msg)
\ No newline at end of file
+# # req_messages.append(msg)
\ No newline at end of file
diff --git a/pkg/provider/runners/difysvapi.py b/pkg/provider/runners/difysvapi.py
new file mode 100644
index 00000000..c3173d6d
--- /dev/null
+++ b/pkg/provider/runners/difysvapi.py
@@ -0,0 +1,144 @@
+from __future__ import annotations
+
+import typing
+import json
+import uuid
+
+from .. import runner
+from ...core import entities as core_entities
+from .. import entities as llm_entities
+from ...utils import image
+
+from libs.dify_service_api.v1 import client, errors
+
+
+@runner.runner_class("dify-service-api")
+class DifyServiceAPIRunner(runner.RequestRunner):
+ """Dify Service API 对话请求器"""
+
+ dify_client: client.AsyncDifyServiceClient
+
+ async def initialize(self):
+ """初始化"""
+ valid_app_types = ['chat', 'workflow']
+ if self.ap.provider_cfg.data['dify-service-api']['app-type'] not in valid_app_types:
+ raise errors.DifyAPIError(f"不支持的 Dify 应用类型: {self.ap.provider_cfg.data['dify-service-api']['app-type']}")
+
+ api_key = self.ap.provider_cfg.data['dify-service-api'][self.ap.provider_cfg.data['dify-service-api']['app-type']]['api-key']
+
+ self.dify_client = client.AsyncDifyServiceClient(
+ api_key=api_key,
+ base_url=self.ap.provider_cfg.data['dify-service-api']['base-url']
+ )
+
+ async def _preprocess_user_message(self, query: core_entities.Query) -> tuple[str, list[str]]:
+ """预处理用户消息,提取纯文本,并将图片上传到 Dify 服务
+
+ Returns:
+ tuple[str, list[str]]: 纯文本和图片的 Dify 服务图片 ID
+ """
+ plain_text = ''
+ image_ids = []
+ if isinstance(query.user_message.content, list):
+ for ce in query.user_message.content:
+ if ce.type == 'text':
+ plain_text += ce.text
+ elif ce.type == 'image_url':
+ file_bytes, image_format = await image.get_qq_image_bytes(ce.image_url.url)
+ file = ("img.png", file_bytes, f"image/{image_format}")
+ file_upload_resp = await self.dify_client.upload_file(file, f"{query.session.launcher_type.value}_{query.session.launcher_id}")
+ image_id = file_upload_resp['id']
+ image_ids.append(image_id)
+ elif isinstance(query.user_message.content, str):
+ plain_text = query.user_message.content
+
+ return plain_text, image_ids
+
+ async def _chat_messages(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
+ """调用聊天助手"""
+ cov_id = query.session.using_conversation.uuid or ""
+
+ plain_text, image_ids = await self._preprocess_user_message(query)
+
+ files = [{
+ 'type': 'image',
+ 'transfer_method': 'local_file',
+ 'upload_file_id': image_id,
+ } for image_id in image_ids]
+
+ resp = await self.dify_client.chat_messages(inputs={}, query=plain_text, user=f"{query.session.launcher_type.value}_{query.session.launcher_id}", conversation_id=cov_id, files=files)
+
+ msg = llm_entities.Message(
+ role='assistant',
+ content=resp['answer'],
+ )
+
+ yield msg
+
+ query.session.using_conversation.uuid = resp['conversation_id']
+
+ async def _workflow_messages(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
+ """调用工作流"""
+
+ if not query.session.using_conversation.uuid:
+ query.session.using_conversation.uuid = str(uuid.uuid4())
+
+ cov_id = query.session.using_conversation.uuid
+
+ plain_text, image_ids = await self._preprocess_user_message(query)
+
+ files = [{
+ 'type': 'image',
+ 'transfer_method': 'local_file',
+ 'upload_file_id': image_id,
+ } for image_id in image_ids]
+
+ ignored_events = ['text_chunk', 'workflow_started']
+
+ async for chunk in self.dify_client.workflow_run(inputs={
+ "langbot_user_message_text": plain_text,
+ "langbot_session_id": f"{query.session.launcher_type.value}_{query.session.launcher_id}",
+ "langbot_conversation_id": cov_id,
+ }, user=f"{query.session.launcher_type.value}_{query.session.launcher_id}", files=files):
+ if chunk['event'] in ignored_events:
+ continue
+
+ if chunk['event'] == 'node_started':
+
+ if chunk['data']['node_type'] == 'start' or chunk['data']['node_type'] == 'end':
+ continue
+
+ msg = llm_entities.Message(
+ role='assistant',
+ content=None,
+ tool_calls=[llm_entities.ToolCall(
+ id=chunk['data']['node_id'],
+ type='function',
+ function=llm_entities.FunctionCall(
+ name=chunk['data']['title'],
+ arguments=json.dumps({}),
+ ),
+ )],
+ )
+
+ yield msg
+
+ elif chunk['event'] == 'workflow_finished':
+
+ msg = llm_entities.Message(
+ role='assistant',
+ content=chunk['data']['outputs'][self.ap.provider_cfg.data['dify-service-api']['workflow']['output-key']],
+ )
+
+ yield msg
+
+ async def run(self, query: core_entities.Query) -> typing.AsyncGenerator[llm_entities.Message, None]:
+ """运行请求"""
+ if self.ap.provider_cfg.data['dify-service-api']['app-type'] == 'chat':
+ async for msg in self._chat_messages(query):
+ yield msg
+ elif self.ap.provider_cfg.data['dify-service-api']['app-type'] == 'workflow':
+ async for msg in self._workflow_messages(query):
+ yield msg
+ else:
+ raise errors.DifyAPIError(f"不支持的 Dify 应用类型: {self.ap.provider_cfg.data['dify-service-api']['app-type']}")
diff --git a/pkg/utils/image.py b/pkg/utils/image.py
index 539337da..dc13802b 100644
--- a/pkg/utils/image.py
+++ b/pkg/utils/image.py
@@ -6,6 +6,31 @@
import aiohttp
+def get_qq_image_downloadable_url(image_url: str) -> tuple[str, dict]:
+ """获取QQ图片的下载链接"""
+ parsed = urlparse(image_url)
+ query = parse_qs(parsed.query)
+ return f"http://{parsed.netloc}{parsed.path}", query
+
+
+async def get_qq_image_bytes(image_url: str) -> tuple[bytes, str]:
+ """获取QQ图片的bytes"""
+ image_url, query = get_qq_image_downloadable_url(image_url)
+ ssl_context = ssl.create_default_context()
+ ssl_context.check_hostname = False
+ ssl_context.verify_mode = ssl.CERT_NONE
+ async with aiohttp.ClientSession(trust_env=False) as session:
+ async with session.get(image_url, params=query, ssl=ssl_context) as resp:
+ resp.raise_for_status()
+ file_bytes = await resp.read()
+ content_type = resp.headers.get('Content-Type')
+ if not content_type or not content_type.startswith('image/'):
+ image_format = 'jpeg'
+ else:
+ image_format = content_type.split('/')[-1]
+ return file_bytes, image_format
+
+
async def qq_image_url_to_base64(
image_url: str
) -> typing.Tuple[str, str]:
@@ -17,29 +42,12 @@ async def qq_image_url_to_base64(
Returns:
typing.Tuple[str, str]: base64编码和图片格式
"""
- parsed = urlparse(image_url)
- query = parse_qs(parsed.query)
+ image_url, query = get_qq_image_downloadable_url(image_url)
# Flatten the query dictionary
query = {k: v[0] for k, v in query.items()}
- ssl_context = ssl.create_default_context()
- ssl_context.check_hostname = False
- ssl_context.verify_mode = ssl.CERT_NONE
-
- async with aiohttp.ClientSession(trust_env=False) as session:
- async with session.get(
- f"http://{parsed.netloc}{parsed.path}",
- params=query,
- ssl=ssl_context
- ) as resp:
- resp.raise_for_status() # 检查HTTP错误
- file_bytes = await resp.read()
- content_type = resp.headers.get('Content-Type')
- if not content_type or not content_type.startswith('image/'):
- image_format = 'jpeg'
- else:
- image_format = content_type.split('/')[-1]
+ file_bytes, image_format = await get_qq_image_bytes(image_url)
base64_str = base64.b64encode(file_bytes).decode()
diff --git a/templates/provider.json b/templates/provider.json
index ba5cea42..33b9f596 100644
--- a/templates/provider.json
+++ b/templates/provider.json
@@ -57,5 +57,16 @@
"prompt": {
"default": ""
},
- "runner": "local-agent"
+ "runner": "local-agent",
+ "dify-service-api": {
+ "base-url": "https://api.dify.ai/v1",
+ "app-type": "workflow",
+ "chat": {
+ "api-key": "app-1234567890"
+ },
+ "workflow": {
+ "api-key": "app-1234567890",
+ "output-key": "summary"
+ }
+ }
}
\ No newline at end of file
diff --git a/templates/schema/provider.json b/templates/schema/provider.json
index e1d50246..b9467962 100644
--- a/templates/schema/provider.json
+++ b/templates/schema/provider.json
@@ -230,6 +230,51 @@
"title": "请求运行器",
"description": "设置请求运行器。值为local-agent时,使用内置默认运行器;支持插件扩展",
"default": "local-agent"
+ },
+ "dify-service-api": {
+ "type": "object",
+ "title": "Dify Service API 配置",
+ "properties": {
+ "base-url": {
+ "type": "string",
+ "title": "API URL",
+ "description": "Dify Service API 的 基础URL,可以在 Dify 应用 API 页面查看",
+ "default": "https://api.dify.ai/v1"
+ },
+ "app-type": {
+ "type": "string",
+ "title": "应用类型",
+ "description": "支持 chat 和 workflow,chat:聊天助手(含高级编排)和 Agent;workflow:工作流;请填写下方对应的应用类型 API 参数",
+ "enum": ["chat", "workflow"],
+ "default": "chat"
+ },
+ "chat": {
+ "type": "object",
+ "title": "聊天助手 API 参数",
+ "properties": {
+ "api-key": {
+ "type": "string",
+ "title": "API 密钥"
+ }
+ }
+ },
+ "workflow": {
+ "type": "object",
+ "title": "工作流 API 参数",
+ "properties": {
+ "api-key": {
+ "type": "string",
+ "title": "API 密钥"
+ },
+ "output-key": {
+ "type": "string",
+ "title": "工作流输出键",
+ "description": "设置工作流输出键,用于从 Dify Workflow 结束节点返回的 JSON 数据中提取输出内容",
+ "default": "summary"
+ }
+ }
+ }
+ }
}
}
}
\ No newline at end of file