dictionary -> structure file

Co-authored-by: gwen <gwenaelremond@free.fr>
Co-authored-by: gwen <gwenael.remond@free.fr>
Co-authored-by: Emmanuel Garette <egarette@silique.fr>
Reviewed-on: #24
Co-authored-by: gremond <gwenael.remond@protonmail.com>
Co-committed-by: gremond <gwenael.remond@protonmail.com>

CHANGELOG.md

@@ -1,60 +1,3 @@
-## 1.1.1 (2024-11-06)
-
-### Fix
-
-- upgrade tests
-
-## 1.1.1rc0 (2024-11-06)
-
-### Fix
-
-- update tiramisu dependency
-- better user information if a needed package is not installed
-- **37**: import doesn't works for some python version
-- **36**: format 1.0: suffix attribut must works
-- update fr/rougail.mo
-
-## 1.1.0 (2024-11-01)
-
-### Fix
-
-- black
-- add changelog_merge_prerelease to commitizen
-
-## 1.1.0rc0 (2024-11-01)
-
-### Feat
-
-- update dependencies
-- translation
-- in calculation better debugging
-- can sort dictionaries in different directories
-- suffix to identifier
-- better errors messages and improvement
-- better debugging
-- update upgrade module
-- auto add multi for leader
-- use suffix in property calculation
-- in structural commandline very is there is conflict alternative name
-- **#21**: add examples attributes
-- **#23**: define easily a regexoption
-- add relative path support
-- add default inference for basic types
-- suffixes in dynamic family should be a jinja function (#5)
-- we should be able to customize a new variable type
-
-### Fix
-
-- support for unknown language
-- license
-- README
-- use black
-- valid mode even if there is no mode configured
-- valid mode if no mode defined
-- update tests
-- type is not always mandatory
-- auto_save in follower is now allowed in tiramisu
-
 ## 1.0.2 (2024-01-28)
 
 ### Fix

LICENSE

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

README.md

@@ -28,27 +28,20 @@ Create the file `dict/dictionary.yml`:
 
 ```yml
 ---
-version: 1.1
+version: '1.0'
 # describe a variable my_first_variable
 # and a family with a variable my_second_variable
-my_first_variable: my_value
+my_first_variable:
+  default: my_value
 my_family:
-  my_second_variable: 1
+  my_second_variable:
+    type: number
+    mandatory: true
+    value: 1
 ```
 
 ## Generate variable
 
-### With commandline:
-
-```bash
-# rougail -m dict
-Variables:
-┣━━ 📓 my_first_variable: my_value
-┗━━ 📂 my_family
-    ┗━━ 📓 my_second_variable: 1
-
-```
-
 ### With default value:
 
 Here is a python3 example file:
@@ -58,16 +51,19 @@ from rougail import Rougail, RougailConfig
 from pprint import pprint
 
 RougailConfig['dictionaries_dir'] = ['dict']
+RougailConfig['templates_dir'] = ['tmpl']
+RougailConfig['tmp_dir'] = 'tmp'
+RougailConfig['destinations_dir'] = 'dest'
 rougail = Rougail()
-config = rougail.run()
+config = rougail.get_config()
 pprint(config.value.get(), sort_dicts=False)
 ```
 
 The result is:
 
 ```json
-{<TiramisuOption path="rougail">: {<TiramisuOption path="rougail.my_first_variable">: 'my_value',
+{'rougail.my_first_variable': 'my_value',
-                                   <TiramisuOption path="rougail.my_family">: {<TiramisuOption path="rougail.my_family.my_second_variable">: 1}}}
+ 'rougail.my_family.my_second_variable': 1}
 ```
 
 ### With modified value
@@ -80,6 +76,9 @@ from rougail import Rougail, RougailConfig
 from pprint import pprint
 
 RougailConfig['dictionaries_dir'] = ['dict']
+RougailConfig['templates_dir'] = ['tmpl']
+RougailConfig['tmp_dir'] = 'tmp'
+RougailConfig['destinations_dir'] = 'dest'
 rougail = Rougail()
 config = rougail.get_config()
 config.option('rougail.my_first_variable').value.set('modified_value')
@@ -90,8 +89,8 @@ pprint(config.value.get(), sort_dicts=False)
 The destination file is generated with new values:
 
 ```json
-{<TiramisuOption path="rougail">: {<TiramisuOption path="rougail.my_first_variable">: 'modified_value',
+{'rougail.my_first_variable': 'modified_value',
-                                   <TiramisuOption path="rougail.my_family">: {<TiramisuOption path="rougail.my_family.my_second_variable">: 2}}}
+ 'rougail.my_family.my_second_variable': 2}
 ```
 
 # Link

docs/.gitignore

@@ -0,0 +1,2 @@
+.venv/
+build/

docs/Makefile

@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/_static/terminal.css

@@ -0,0 +1,72 @@
+.terminal {
+    background-color: #000000; /* Fond noir */
+    color: #00ff00; /* Texte vert, typique des anciens terminaux */
+    font-family: 'Courier New', Courier, monospace; /* Police à chasse fixe */
+    padding: 5px; /* Espace réduit autour du texte */
+    border-radius: 5px;
+    border: 1px solid #00ff00; /* Bordure verte */
+    white-space: pre-wrap;
+    overflow-x: auto; /* Défilement horizontal si nécessaire */
+    box-shadow: 0 0 10px rgba(0, 255, 0, 0.5); /* Ombre verte pour un effet rétro */
+    display: flex; /* Active Flexbox */
+    line-height: 1.2; /* Espacement entre les lignes */
+    display: inline-block; /* Pour que le fond s'adapte au contenu */
+    width: 100%; /* Largeur maximale */
+}
+
+.terminal,
+.terminal * {
+    border: none !important; /* Supprime toutes les bordures à l'intérieur du terminal */
+}
+
+.terminal .highlight {
+    margin: 0; /* Supprime les marges */
+    padding: 0; /* Supprime les paddings */
+    background-color: transparent; /* Fond transparent pour éviter les conflits */
+}
+
+.terminal .highlight pre {
+    margin: 0; /* Supprime les marges */
+    padding: 0; /* Supprime les paddings */
+    background-color: transparent; /* Fond transparent */
+    color: inherit; /* Hérite la couleur du texte du parent */
+    font-family: inherit; /* Hérite la police du parent */
+    line-height: inherit; /* Hérite l'espacement des lignes du parent */
+}
+
+.terminal .highlight pre span {
+    display: inline; /* Évite les espaces inutiles causés par inline-block */
+    margin: 0; /* Supprime les marges */
+    padding: 0; /* Supprime les paddings */
+}
+
+.terminal .go {
+    color: #00ff00; /* Couleur pour le texte de sortie du terminal */
+}
+
+/* raw html output css */
+
+/* Styles communs pour les deux classes */
+.error-box, .output {
+    padding: 10px; /* Espace intérieur */
+    font-size: 0.8em; /* Taille de police plus petite */
+    width: fit-content; /* Ajuste la largeur au contenu */
+    border-radius: 5px; /* Coins arrondis */
+    display: inline-block; /* Pour que la boîte s'ajuste au contenu */
+}
+
+.error-box pre, .output pre {
+    margin: 0; /* Supprime la marge par défaut du <pre> */
+}
+
+/* Styles spécifiques à la classe error-box */
+.error-box {
+    border: 2px solid #ff0000; /* Bordure rouge */
+    background-color: #ffe6e6; /* Fond légèrement rouge */
+}
+
+/* Styles spécifiques à la classe output */
+.output {
+    border: 2px solid #00ff00; /* Bordure verte */
+    background-color: #e6ffe6; /* Fond légèrement vert */
+}

docs/bribes.txt

@@ -1,2 +0,0 @@
-variable
- <https://en.wikipedia.org/wiki/Variable_(computer_science)>`_

docs/conf.py

@@ -1,24 +1,20 @@
 # Configuration file for the Sphinx documentation builder.
 #
-# This file does only contain a selection of the most common options. For a
-# full list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
-
 # -- Path setup --------------------------------------------------------------
 
-# If extensions (or modules to document with autodoc) are in another directory,
+import sys, os
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
 # sys.path.insert(0, os.path.abspath('.'))
+#sys.path.append(os.path.abspath('ext'))
+sys.path.append('.')
 
+#---- debug mode ----
+# shows/hides the todos
+todo_include_todos = True
 
 # -- Project information -----------------------------------------------------
 
 project = 'Rougail'
-copyright = '2019-2023, Silique'
+copyright = '2019-2024, Silique'
 author = 'gwen'
 
 # The short X.Y version
@@ -33,55 +29,46 @@ release = '1.0'
 #
 # needs_sphinx = '1.0'
 
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-
 extensions = [
-        'sphinx.ext.extlinks', 'sphinx_lesson',
+        'sphinx.ext.extlinks', 'sphinx_lesson', 'sphinx.ext.todo',
-        #'myst_parser', 'sphinx.ext.extlinks'
+        'sphinx.ext.extlinks', 'ext.xref', 'ext.extinclude'
 ]
-#
-#myst_enable_extensions = [
-#    "amsmath",
-#    "attrs_inline",
-#    "colon_fence",
-#    "deflist",
-#    "dollarmath",
-#    "fieldlist",
-#    "html_admonition",
-#    "html_image",
-##    "linkify",
-#    "replacements",
-#    "smartquotes",
-#    "strikethrough",
-#    "substitution",
-#    "tasklist",
-#]
 
+#---- xref links ----
+#import the xref.py extension
+xref_links = {"link_name" : ("user text", "url")}
 
+#link_name = "Sphinx External Links"
+#user_text = "modified External Links Extension"
+#url = "http://www.sphinx-doc.org/en/stable/ext/extlinks.html"
+#enables syntax like:
+" :xref:`tiramisu` "
+links = {
+        'tiramisu': ('Tiramisu', 'https://tiramisu.readthedocs.io/en/latest/'),
+        'tiramisu library': ('Tiramisu library homepage', 'https://forge.cloud.silique.fr/stove/tiramisu'),
+        }
+xref_links.update(links)
+#---- ext links ----
 # **extlinks** 'sphinx.ext.extlinks',
-# enables syntax like :proxy:`my source <hello>` in the src files
+# enables syntax like
-extlinks = {'proxy': ('/proxy/%s.html',
+" :source:`v1.1_010/firefox/00-proxy.yml` "
-                      'external link: ')}
+extlinks = {'source': ('https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/%s',
-
+                       'source: %s'),
+            'tiramisu': ('https://tiramisu.readthedocs.io/en/latest/%s', 'tiramisu: %s'),
+            }
+#---- options for HTML output ----
 default_role = "code"
-
 html_theme = "sphinx_rtd_theme"
-
 pygments_style = 'sphinx'
-
 html_short_title = "Rougail"
 html_title = "Rougail documenation"
-
-# If true, links to the reST sources are added to the pages.
 html_show_sourcelink = False
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 html_show_sphinx = False
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 html_show_copyright = True
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = None
+html_static_path = ['_static']
+html_css_files = ['terminal.css']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -109,41 +96,8 @@ language = 'en'
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ['.venv', 'build', '_build', 'Thumbs.db', '.DS_Store']
 
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = None
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-#html_theme = 'alabaster'
-# **themes**
-#html_theme = 'bizstyle'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself.  Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-#
-# html_sidebars = {}
 
 def setup(app):
    app.add_css_file('css/custom.css')

docs/dictionary.rst

@@ -1,16 +1,16 @@
-The dictionaries
+The structure files
 =====================
 
-What do you mean by :term:`dictionary`?
+What do you mean by :term:`structure file`?
 -------------------------------------------
 
-A :term:`dictionary` is a YAML file whose structure is described in this documentation page.
+A :term:`structure file` is a YAML file whose structure is described in this documentation page.
 
-A dictionary contains a set of variables loaded into :term:`Tiramisu`, usable at any time, especially in a :term:`templates`.
+A structure file contains a set of variables loaded into :term:`Tiramisu`, usable at any time, especially in a :term:`templates`.
 
-:term:`Families` and :term:`variables` can be defined in several dictionaries. These dictionaries are then aggregated.
+:term:`Families` and :term:`variables` can be defined in several structure files. These structure files are then aggregated.
 
-Dictionaries are loaded in the directory order defined by the `dictionaries_dir` configuration parameter. 
+Structure files are loaded in the directory order defined by the `dictionaries_dir` configuration parameter. 
 Each directory is loaded one after the other. 
 Inside these directories the YAML files will be classified in alphabetical order.
 
@@ -21,11 +21,11 @@ It is also possible to :term:`redefine` elements to change the behavior of a fam
 The default namespace
 -------------------------
 
-The families and variables contained in these dictionaries are ordered, by default, in the `rougail` namespace. It is possible to change the name of this namespace :doc:`with the `variable_namespace` parameter of the configuration <configuration>`.
+The families and variables contained in these structure files are ordered, by default, in the `rougail` namespace. It is possible to change the name of this namespace with the :term:`variable namespace <variable_namespace>` parameter of the :doc:`configuration <configuration>`.
 
 This namespace is a bit special, it can access variables in another namespace.
 
-The extra dictionaries
+The extra structure files
 ---------------------------
 
 An extra is a different namespace. The idea is to be able to classify the variables by theme.

docs/ext/extinclude.py

@@ -0,0 +1,69 @@
+from __future__ import annotations
+
+
+from docutils import nodes
+from sphinx.application import Sphinx
+from sphinx.util.docutils import SphinxDirective, SphinxRole
+from sphinx.util.typing import ExtensionMetadata
+from sphinx.directives.code import LiteralInclude, container_wrapper
+
+import requests
+
+class ExtInclude(LiteralInclude):
+    """A directive to include code that comes from an url
+
+    Sample use::
+
+        .. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_010/firefox/00-proxy.yml
+           :linenos:
+           :language: yaml
+           :caption: this is a interesting code
+
+    - parameter required
+    - linenos, language and caption are optionnal.
+
+    :default language: yaml
+    :default caption: extinclude parameter (url)
+
+    """
+
+    def run(self) -> list[nodes.Node]:
+        url = self.arguments[0]
+        headers = {
+            'accept': 'application/text',
+            'Content-Type': 'application/text',
+            }
+        response = requests.get(url, headers=headers)
+        #paragraph_node = nodes.paragraph(text=f'hello {self.arguments[0]}!')
+        code = response.text
+
+        literal = nodes.literal_block(code, code)
+        if 'language' in self.options:
+            literal['language'] = self.options['language']
+        else:
+            literal['language'] = 'yaml'
+        literal['linenos'] = 'linenos' in self.options
+        if 'caption' in self.options:
+            caption = self.options.get('caption')
+        else:
+            caption = url
+        literal['caption'] = caption
+        if 'name' in self.options:
+            literal['name'] = self.options.get('name')
+        literal = container_wrapper(self, literal, caption)
+        self.add_name(literal)
+
+        return [literal]
+        #paragraph_node = nodes.paragraph(text=content.text)
+        #return [paragraph_node]
+
+
+def setup(app: Sphinx) -> ExtensionMetadata:
+
+    app.add_directive('extinclude', ExtInclude)
+
+    return {
+        'version': '0.1',
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }

docs/ext/xref.py

@@ -0,0 +1,42 @@
+"""adds link url in the global scope
+"""
+from docutils import nodes
+
+from sphinx.util import caption_ref_re
+
+def xref( typ, rawtext, text, lineno, inliner, options={}, content=[] ):
+
+    title = target = text
+    titleistarget = True
+    # look if explicit title and target are given with `foo <bar>` syntax
+    brace = text.find('<')
+    if brace != -1:
+        titleistarget = False
+        m = caption_ref_re.match(text)
+        if m:
+            target = m.group(2)
+            title = m.group(1)
+        else:
+            # fallback: everything after '<' is the target
+            target = text[brace+1:]
+            title = text[:brace]
+
+    link = xref.links[target]
+
+    if brace != -1:
+        pnode = nodes.reference(target, title, refuri=link[1])
+    else:
+        pnode = nodes.reference(target, link[0], refuri=link[1])
+
+    return [pnode], []
+
+def get_refs(app):
+
+    xref.links = app.config.xref_links
+
+def setup(app):
+
+    app.add_config_value('xref_links', {}, True)
+    app.add_role('xref', xref)
+    app.connect("builder-inited", get_refs)
+

docs/family.rst

@@ -1,19 +1,28 @@
-A family
+The families
-============
+=============
 
 Synopsis
 ---------
 
-A family is a container of variables and subfamily.
+.. glossary::
+
+   family
+   families
+
+       A family of variables is simply a collection of variables that refer to
+       the same business model category. It's just a variables container.
+       Think of it as a container as well as a namespace.
 
 .. attention:: A family without a subfamily or subvariable will be automatically deleted.
 
-Name
+Naming conventions
--------------
+------------------------
 
-It is with this name that we will be able to interact with the family.
+It is with its name that we will be able to interact with the family.
 
-It's best to follow the :ref:`convention on variable names`.
+.. seealso:: 
+
+    Have a look at the :ref:`convention on variable names`.
 
 Shorthand declaration
 ----------------------------
@@ -35,7 +44,7 @@ If you add comment in same line of name, this comment is use as description:
 Parameters
 ---------------
 
-.. FIXME: faire une page sur la "convention on variable names"
+.. todo:: faire une page sur la "convention on variable names"
 
 .. list-table::
    :widths: 15 45

docs/fill.rst

@@ -48,11 +48,11 @@ Depending on the types of calculation, the parameters will be different:
 
        `mandatory`
      - Template Jinja. For a multiple variable, each line represents a value.
-     - `{% if rougail.variable %}
+     - `{% if rougail.variable %}`
 
-       {{ rougail.variable }}
+       `{{ rougail.variable }}`
 
-       {% endif %}`
+       `{% endif %}`
    * - Jinja
      - **params**
 
@@ -170,6 +170,7 @@ Inside those namespaces we can add families and variables.
 Here is an hierarchic examples:
 
 .. code-block::
+
   rougail
     ├── variable1
     ├── family1
@@ -210,6 +211,7 @@ Dynamic family
 Hire is a dynamic family "{{ suffix }}":
 
 .. code-block::
+
   rougail
     ├── variable1: ["val1", "val2"]
     ├── {{ suffix }}

docs/gettingstarted.rst

@@ -1,43 +1,44 @@
-.. |Tiramisu| replace:: Tiramisu
-.. _tiramisu: https://forge.cloud.silique.fr/stove/tiramisu
-
 Getting started
 ====================
 
 What is a consistency handling system ?
 ------------------------------------------------
 
-.. questions:: Question: "OK, I have understood that the Rougail stuff enables me to take advantage of |Tiramisu|. But what is all this for? What is exactly a consistency handling system? And again, what is this |Tiramisu| library used for?"
+.. questions:: Question
 
-    *Answer*: Well, let's explain what |Tiramisu| is and how we are using the |Tiramisu| library.
+    "OK, I have understood that the Rougail stuff enables me to take advantage of :xref:`tiramisu`.
+    But what is all this for?
+    What is exactly a consistency handling system?
+    And again, what is this :xref:`tiramisu` library used for?"
+
+    **Answer**: Well, now we explain what this :xref:`tiramisu` library is, and how we are using it.
 
 .. glossary::
 
    Tiramisu
 
-        |Tiramisu| is a consistency handling system that has initially been designed
+        :xref:`tiramisu` is a consistency handling system that has initially been designed
         in the configuration management scope. To put it more simply,
         this library is generally used to handle configuration options.
 
         It manages variables and group of variables. In the Tiramisu scope we call
         it *options* and *option descriptions*.
 
+        Here is the :xref:`tiramisu library`.
+
 In the Rougail scope, we call it :term:`variable`\ s and :term:`families`.
-In Rougail, the families and variables are located in the :term:`dictionaries`.
+In Rougail, the families and variables are located in the :term:`structure files <structure file>`.
 
-And this is what we are going to explain in this page.
+The structure files
-
-The dictionaries
 ---------------------
 
 .. glossary::
 
-   dictionary
+   structure file
-   dictionaries
 
-       A dictionary in the Rougail meaning is a YAML file that describes variables
+       A structure file in the Rougail meaning is a YAML file that describes variables
        and their dependencies / consistencies.
-       There can be a lot of dictionary files located in many different folders.
+       There can be a lot of structure files located in many different folders.
 
        Rougail reads all the dictionaries and loads them into a single object
        that handles the variables consistency.
@@ -48,144 +49,128 @@ The main advantage is that declaring variables and writing consistency is as sim
 as writing YAML. With Rougail it is not necessary to write :term:`Tiramisu` code any more.
 It simplifies a lot of things.
 
-And rather than writing :term:`Tiramisu` code, we can declare variables and describe the relationships between variables in a declarative mode (that is, in a YAML file).
+And rather than writing :term:`Tiramisu` code, we can declare variables and describe the relationships between variables in a declarative style (that is, in a YAML file).
 
-Once the dictionaries are loaded by Rougail, we find all the power of the :term:`Tiramisu` configuration management tool.
+Once the structure files are loaded by Rougail, the Tiramisu configuration management tool can check the consistency of the variables between them.
 
-The YAML dictionaries format
+The YAML structure files format
------------------------------
+------------------------------------
 
-Before getting started with Rougail we need to learn the specifics of the YAML dictionaries file format (as well as some templating concepts).
+We need to learn first the specifics of the YAML dictionaries file format in Rougail, as well as some templating concepts.
 
-.. FIXME parler de jinja https://jinja.palletsprojects.com
+Here is an empty Rougail structure YAML file
 
-Here is a :term:`dictionary` example:
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_000/firefox/00-proxy.yml
-
-.. code-block:: yaml
    :linenos:
+   :language: yaml
+   :caption: An empty Rougail dictionnary file. It's a YAML format.
+   :name: RougailDictionaryEmptyFile
 
+..
     ---
-    version: '1.1'
+    version: 1.1
-    proxy:
-      description: Configure Proxy Access to the Internet
-      type: family
 
-Line 3, we declare a **variable** named `proxy` with his `description` line 4 and his `type` line 5.
+
+:download:`source file <https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_000/firefox/00-proxy.yml>`
+
+You can see that there is just a `version` specification.
+
+.. glossary::
+
+   version
+
+       The version is here a Rougail YAML structure file version format.
+       It is set in the beginning of a YAML structure file, or globaly in the Rougail settings
+       for example from the command line
+
+.. note:: You can set the format in the Rougail command line tool like this:
+
+       .. code-block:: bash
+
+            rougail -v 1.1
 
 The variables
 -----------------
 
+Here is a :term:`structure file` example with a variable into it:
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_010/firefox/00-proxy.yml
+   :language: yaml
+   :caption: A Rougail dictionnary file with a variable named `proxy_mode`. It's the Rougail YAML structure file format.
+   :name: RougailDictionaryFirstVariable
+
+..
+    ---
+    proxy_mode:
+
+Here we declare a **variable** named `proxy_mode` without a default value.
+A variable can be defined with no default value at all.
+
+Here is the same variable with a description label:
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_011/firefox/00-proxy.yml
+   :language: yaml
+   :caption: A Rougail dictionnary file with a variable named `proxy_mode`, with a description.
+   :name: RougailDictionaryFirstVariableDescription
+
+..
+    ---
+    proxy_mode:
+      description: Configure Proxy Access to the Internet
+
+The same with a default value:
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_012/firefox/00-proxy.yml
+   :language: yaml
+   :caption: A Rougail dictionnary file with a variable named `proxy_mode`, with a default value.
+   :name: RougailDictionaryFirstVariableDefault
+
+..
+    ---
+    proxy_mode:
+      description: Configure Proxy Access to the Internet
+      default: No proxy
+
 variable
 
-    Here is a second definition of a :term:`variable`: it is a declaration unit that represents a business domain metaphor,
+    A :term:`variable` is a declaration unit that represents a business domain metaphor,
     the most common example is that a variable that represents a configuration option
     in a application, but a variable represents something more that a configuration option.
     It provides a business domain specific representation unit.
 
-.. note:: Dictionaries can just define a list of variables, but we will see that
-          we can specify a lot more. We can define variables **and** their relations,
-          **and** the consistency between them.
-
-In the next step, we will explain through a tutorial how to construct a list of variables.
-
 Families of variables
 --------------------------
 
-.. glossary::
+family
 
-   family
+    A :term:`family` is simply a container of variables and subfamily.
-   families
 
-       A family of variables is simply a collection of variables that refer to
+.. _installation:
-       the same business model category. It's just a variables container.
-       Think of it as a container as well as a namespace.
 
-A "hello world" with Rougail
+Installation
-------------------------------
+----------------
 
-We're gonna make the simplest possible example.
+You just have to type this in your preferred terminal:
 
-.. prerequisites:: Prerequisites
+.. code-block:: text
 
-We assume that Rougail's library is installed on your computer (or in a virtual environment).
+    pip install rougail
     
-.. exercise:: Let's make a Hello world
+a better way to install the Rougail library in to do this in a virtual environment:
 
-Here is the tree structure we want to have::
+.. code-block:: text
 
-    workplace
+    python -m"venv' .venv
-    ├── dict
-    │   ├── hello.yml
-    └── hello.py
 
-- Let's make a :file:`workplace` directory, with a :file:`dict` subfolder.
+And, under linux or Mac:
-- First, we need a :term:`dictionary`, so let's make the :file:`hello.yml` file
-  which is located in the :file:`dict` subfolder, with the following content:
 
-.. code-block:: yaml
+.. code-block:: shell
-   :caption: The `hello.yaml` file
 
-    ---
+    ./.venv/bin/activate 
-    version: '1.1'
-    hello:
-      default: world
 
-- Then we make a :file:`hello.py` in our root :file:`workplace` directory:
+or, under windows:
 
-.. code-block:: python
+.. code-block:: text 
-   :caption: The :file:`hello.py` file
 
-    from rougail import Rougail, RougailConfig
+    .venv\Scripts\activate.exe 
 
-    RougailConfig['dictionaries_dir'] = ['dict']
-    rougail = Rougail()
-    config = rougail.get_config()
-    print(config.value.get())
-
-.. demo:: Let's run the :file:`hello.py` script
-
-We launch the script:
-
-.. code-block:: bash
-
-    python hello.py
-
-And we obtain the following result:
-
-.. code-block:: python
-
-    {'rougail.hello': 'world'}
-
-**Congratulations ! You have successfully completed your first Rougail script.**
-
-A "Hello, <name> " sample with a family
-------------------------------------------
-
-Let's continuing on our "Hello world" theme and add a :term:`family` container.
-
-.. code-block:: yaml
-   :caption: the :file:`hello.yml` file
-   :linenos:
-
-    ---
-    version: '1.1'
-    world:
-      description: Hello world family container
-      name:
-        description: Somebody to say hello
-        default: rougail
-
-Here, we have a family named `world`.
-This family contains a variable named `name`
-
-Again, let's validate this YAML file against Rougail's API:
-
-.. code-block:: bash
-
-    python hello.py
-
-We then have the output:
-
-.. code-block:: python
-
-    {'rougail.world.name': 'rougail'}

docs/index.rst

@@ -8,11 +8,34 @@
 Rougail
 ===========
 
+.. todolist::
+
+
+.. todo:: définir les termes suivants
+
+    family.rst:25: WARNING: label non défini: 'convention on variable names'
+    /family.rst:114: WARNING: term not in glossary: 'calculation'
+    /variable.rst:39: WARNING: label non défini: 'convention on variable names'
+    /variable.rst:83: WARNING: term not in glossary: 'leading'
+    /variable.rst:100: WARNING: term not in glossary: 'required'
+    /variable.rst:102: WARNING: term not in glossary: 'leader'
+    /variable.rst:102: WARNING: term not in glossary: 'follower'
+    /variable.rst:126: WARNING: term not in glossary: 'multiple'
+    /variable.rst:126: WARNING: term not in glossary: 'multiple'
+    /variable.rst:131: WARNING: term not in glossary: 'calculation'
+    /variable.rst:143: WARNING: term not in glossary: 'calculation'
+    /variable.rst:148: WARNING: term not in glossary: 'calculation'
+    /variable.rst:153: WARNING: term not in glossary: 'calculation'
+    /dictionary.rst:9: WARNING: term not in glossary: 'templates'
+    /dictionary.rst:19: WARNING: term not in glossary: 'redefine'
+    /dictionary.rst:24: WARNING: term not in glossary: 'variable_namespace'
+
+
 .. image:: images/logo.png
 
 - is a `delicious cooked dish <https://fr.wikipedia.org/wiki/Rougail>`_ from the Mauritius  and Reunion Islands,
 
-- it is also a `Python3 <https://www.python.org/>`_ library  which enables us to conveniently load application :term:`variable`\ s in a simple `YAML <https://yaml.org/>`_ format in such a way that the end user consumer can handle them consistently (that is, against an user-defined consistency).
+- it is also a `Python <https://www.python.org/>`_ library  which enables us to conveniently load application :term:`variable`\ s in a simple `YAML <https://yaml.org/>`_ format in such a way that the end user consumer can handle them consistently (that is, against an user-defined consistency).
 
 In other words, using Rougail in your application or your python libraries can tansform end user consumer defined consistency rules into highly consistent business objects.
 
@@ -27,14 +50,7 @@ Explained differently, Rougail allows you to easily implement an integration of
    :caption: Getting started
 
    gettingstarted
-   tutorial
+   tutorial/index
-
-.. toctree::
-   :titlesonly:
-   :caption: The library
-   
-   library
-   configuration
 
 .. toctree::
    :titlesonly:
@@ -53,6 +69,13 @@ Explained differently, Rougail allows you to easily implement an integration of
    Value checks <check>
    condition
 
+.. toctree::
+   :titlesonly:
+   :caption: The library
+
+   library
+   configuration
+
 .. toctree::
    :titlesonly:
    :caption: Notes

docs/library.rst

@@ -14,14 +14,14 @@ To load the configuration you must import the `RougailConfig` class and set the
 
     RougailConfig['dictionaries_dir'] = ['dict']
 
-Let's convert a dictionary
+Let's convert a structure file
------------------------------
+-------------------------------
 
-As a reminder, a :term:`dictionary` is a set of instructions that will allow us to create :term:`families` and :term:`variables`.
+As a reminder, a :term:`structure file` is a set of instructions that will allow us to create :term:`families` and :term:`variables`.
 
-Let's start by creating a simple dictionary.
+Let's start by creating a simple structure file.
 
-Here is a first :file:`dict/00-base.yml` dictionary:
+Here is a first :file:`dict/00-base.yml` structure file:
 
 .. code-block:: yaml
 
@@ -42,15 +42,34 @@ Then, let's create the :term:`Tiramisu` objects via the following script:
     config = rougail.get_config()
     print(config.value.get())
 
-Let's execute `script.py`:
+.. demo:: Let's execute `script.py`:
 
-.. code-block:: bash
+    .. code-block:: bash
 
-    $ python3 script.py
+        $ python3 script.py
-    {'rougail.my_variable': 'my_value'}
+        {'rougail.my_variable': 'my_value'}
 
-Let's convert an extra dictionary
+The operator role
--------------------------------------
+--------------------
+
+
+The :term:`operator` role corresponds to the :term:`tiramisu` settings:
+
+.. image:: images/tiramisu_get_set.png
+
+.. index:: questionary
+
+But instead of coding in the end user developer way, the opterator will prefer using the Rougail CLI interface:
+
+.. image:: images/QuestionaryChoice.png
+
+
+The Rougail CLI can output a rather complete view of the dataset:
+
+.. image:: images/UserDataOutput.png
+
+Let's convert an extra structure file 
+---------------------------------------
 
 .. index:: extras
 
@@ -66,7 +85,7 @@ For example, here's how to add an `example` namespace:
 
     RougailConfig['extra_dictionaries']['example'] = ['extras/']
 
-Then let's create an extra :term:`dictionary` :file:`extras/00-base.yml`:
+Then let's create an extra :term:`structure file` :file:`extras/00-base.yml`:
 
 .. code-block:: yaml
    :caption: the :file:`extras/00-base.yml` file content
@@ -98,7 +117,7 @@ Let's execute `script.py`:
 Let's create a custom function
 ----------------------------------
 
-We create the complementary :term:`dictionary` named :file:`dict/01-function.yml` so that the  `my_variable_jinja` variable is :term:`calculated`:
+We create the complementary :term:`structure file` named :file:`dict/01-function.yml` so that the  `my_variable_jinja` variable is :term:`calculated`:
 
 .. code-block:: yaml
 
@@ -170,20 +189,23 @@ Here an example to a lipogram option (in a string, we cannot use "e" character):
 To add the new lipogram type in Rougail:
 
 .. code-block:: python
+
     >>> from rougail import Rougail, RougailConfig
     >>> RougailConfig['dictionaries_dir'] = ['dict']
     >>> RougailConfig['custom_types']['lipogram'] = LipogramOption
 
 Now, we can use lipogram type.
-Here is a :file:`dict/00-base.yml` dictionary:
+Here is a :file:`dict/00-base.yml` structure file:
 
 .. code-block:: yaml
+
     ---
     version: '1.1'
     var:
       type: lipogram
 
 .. code-block:: python
+
     >>> rougail = Rougail()
     >>> config = rougail.get_config()
     >>> config.option('rougail.var').value.set('blah')
@@ -197,7 +219,7 @@ Upgrade dictionnaries to upper version
 All dictionnaries has a format version number.
 When a new format version is proposed, it is possible to automatically convert the files to the new version.
 
-We create a term:`dictionary` named :file:`dict/01-upgrade.yml` with version 1.0:
+We create a term:`structure file` named :file:`dict/01-upgrade.yml` with version 1.0:
 
 .. code-block:: yaml
 
@@ -212,12 +234,13 @@ We create a term:`dictionary` named :file:`dict/01-upgrade.yml` with version 1.0
 
 
 .. code-block:: python
+
     >>> from rougail import RougailUpgrade, RougailConfig
     >>> RougailConfig['dictionaries_dir'] = ['dict']
     >>> upgrade = RougailUpgrade()
     >>> upgrade.load_dictionaries('dict_converted')
 
-The term:`dictionary` named :file:`dict_converted/01-upgrade.yml` is in version 1.1:
+The term:`structure file` named :file:`dict_converted/01-upgrade.yml` is in version 1.1:
 
 .. code-block:: yaml
 

docs/readme.txt

@@ -0,0 +1,25 @@
+Building the doc locally
+============================
+
+install
+---------
+
+First, install a python virtual environment::
+
+    python -m venv .venv
+    source .venv/bin/activate
+
+Then install the sphinx libraries::
+
+    ./.venv/bin/pip3 install sphinx
+    ./.venv/bin/pip3 install sphinx_rtd_theme
+    ./.venv/bin/pip3 install sphinx_lesson
+
+
+The generatef html output is located in the `docs/build/html` subfolder,
+you can modify the target or the output type in the :file:`docs/Makefile`.
+
+scraps
+---------
+
+`variable <https://en.wikipedia.org/wiki/Variable_(computer_science)>`_

docs/tutorial/index.rst

@@ -0,0 +1,45 @@
+Tutorial with a real world sample
+=====================================
+
+Here is a fairly complete tutorial, this is a use case that comes from the real world.
+At the end of the tutorial you will have a good understanding of rougail.
+
+.. objectives:: Configuring (the setting of) your favorite web browser
+
+    This tutorial will show you an example of Rougail use based on the
+    *how to set a proxy* in the `Mozilla Firefox <https://www.mozilla.org/en-US/firefox/new/>`_ browser
+    use case.
+
+More precisely, this tutorial aims at reproducing :term:`variable`\ s behind this Mozilla Firefox settings page:
+
+.. image:: images/firefox.png
+
+We'll call the variables **configuration options** since that's what the variables represent in this case.
+
+.. attention:: We are not coding a firefox plugin here.
+          We are just going to handle some of the firefox configuration settings
+          with Rougail.
+
+Presentation of the firefox option configuration variables
+-----------------------------------------------------------
+
+Let's dive into this **configuration options validation** use case.
+The values entered by the user have to be 
+
+- validated
+- consitent.
+
+At first glance we can see that we have a selection of five configuration options values that we need to fill in (they are highlighted here in this screenshot):
+
+.. image:: images/firefox_01.png
+
+
+.. toctree::
+   :titlesonly:
+   :caption: The firefox tutorial steps
+   :hidden:
+
+   preliminary
+   proxymode
+   tutorial
+

docs/tutorial/preliminary.rst

@@ -0,0 +1,344 @@
+Preliminaries
+================
+
+.. objectives:: Objectives
+
+   We will learn how to:
+
+   - create a Rougail :term:`structure description file <structure file>`
+   - define a Rougail :term:`structure description file <structure file>` format version
+   - define a Rougail :term:`variable` and set its :term:`value`
+
+.. prerequisites:: Prerequisites
+
+    We assume that Rougail's library is :ref:`already installed <installation>` on your computer (or in a virtual environment).
+
+.. type-along:: an empty structure file
+
+    An empty structure description file
+
+.. exercise:: The folder structure
+
+    Here is the tree structure we want to have::
+
+        workplace
+        ├── firefox
+        │   └── struct.yml
+
+- Let's make a :file:`workplace` directory, with a :file:`firefox` subfolder.
+- First, we wil make a :term:`structure file <structure file>`, so let's create a :file:`struct.yml` file
+  located in the :file:`firefox` subfolder.
+
+The structure file 
+--------------------
+
+This is an empty Rougail dictionnary
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_000/firefox/00-proxy.yml
+   :language: yaml
+   :caption: An empty rougail dictionnary file with the version number only
+   :name: RougailStructVersion
+
+.. 
+    ---
+    version: 1.1
+
+.. type-along:: a first variable
+
+    Let's put a variable in the Rougail :term:`structure description file <structure file>`
+
+Defining a variable and its default value
+----------------------------------------------
+
+This is a first Rougail variable in a Rougail dictionnary.
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_010/firefox/00-proxy.yml
+   :language: yaml
+   :caption: A Rougail dictionnary file with only one variable
+   :name: RougailDictionaryFirstVariableName
+
+.. 
+    ---
+    proxy_mode:
+
+- Then if we run the Rougail CLI utility command 
+
+.. code-block:: text
+   :class: terminal
+   
+    rougail -v 1.1 -m firefox/
+
+we will actually have an error: 
+
+.. raw:: html
+   :url: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_010/config/01/output_ro.html
+   :class: error-box
+
+..
+    🛑 ERRORS
+    ┣━━ The following variables are mandatory but have no value:
+    ┗━━   - proxy_mode
+
+Because this variable is :term:`mandatory` and needs to be set **but** there's no value yet.
+
+So we can therefore see this consequence:
+
+.. important:: Once defined, an option configuration :term:`value` is :term:`mandatory`.
+
+Rougail waits for the `proxy_mode` configuration option's value to be set.
+
+.. seealso:: To go further, have a look at the :tiramisu:`mandatory option <glossary.html#term-mandatory-option>` Tiramisu's definition.
+
+.. glossary::
+
+    mandatory
+
+        A variable is mandatory when a value is required, that is, `None` is not an option.
+
+Then we just add a variable's description, which is a good practice.
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_011/firefox/00-proxy.yml
+   :language: yaml
+   :caption: A Rougail dictionnary file with a variable and a description
+   :name: RougailStructFirstVariableDescription
+
+.. 
+    ---
+    proxy_mode:
+      description: Configure Proxy Access to the Internet
+
+We need a **default value**. 
+
+.. glossary::
+
+    default values
+        
+        A default value is a variable value that is predefined, that is, this value is placed 
+        right in the structure file.
+
+So let's define a variable with a description -- **and a default value**
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/commit/a1969abccd5e10872d4eb901a26fa16007c9fb1d/firefox/00-proxy.yml
+    :language: yaml
+    :caption: A rougail dictionnary file with a default value for the variable
+    :name: RougailDictionaryVariableDefault
+
+..
+    ---
+    proxy_mode:
+      description: Configure Proxy Access to the Internet
+      default: No proxy
+
+
+.. type-along:: how to set a value
+
+    A default value has been set, great. Now how do I assign a value to a variable?
+
+How to set a value
+----------------------
+
+So far we have only talked about the one that writes the structure files. It is called the integrator. 
+
+.. glossary::
+
+    integrator
+
+        An integrator in the Rougail logic is the person who writes the :term:`structure files <structure file>`\ .
+        He has the responsibilité of the integration process, that is,
+        defines the variables and the relationship between them, the variables that are allowed
+        (or not) to be set, and so on. His responsabilites are the **structuration** and the **consistency**
+        of the variables.
+
+Now we will talk about the one that defines the values. It is called the operator.
+
+.. glossary::
+
+    operator
+
+        An operator ih the Rougail logic is the person who gives :term:`value`\ s to the pre-defined variables,
+        his responsabilities are to set variable values correctly.
+
+        The user :term:`value`\ s, that is the values that have been set by the operator, are of course type validated by the :term:`structure file definition <structure file>`.
+
+Values are mandatory
+-------------------------
+
+It is the operator's responsibility to set configuration options values.
+He does not work with the structure file, 
+he is responsible for other files, called the configuration files. 
+
+.. glossary::
+
+    configuration file
+    
+        A configuration file is a file where only the values ​​of the configuration options are assigned. The structure, the consistency of the variables between them is not the responsibility of these files (but of the structure files).
+
+.. exercise:: Folder structure update
+
+    Now we add a :file:`config/config.yml` file in our project::
+
+        workplace
+        ├── firefox
+        │   ├── struct.yml
+        └── config
+            └── config.yml
+
+.. type-along:: how to set a default value in a configuration file
+
+So for example if the integrator has not set any default value in his structure file, 
+the operator can do it like this:
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_011/config/02/config.yaml
+   :language: yaml
+   :caption: The Rougail configuration file :file:`config/config.yml`, with a default value set.
+   :name: RougailConfigDefaultValue
+
+.. 
+    ---
+    proxy_mode: No proxy
+
+With the rougail CLI the operator has to add the `-u file -ff config/config.yml` options: 
+
+.. code-block:: text
+   :class: terminal
+   :caption: A rougail Command Line Utility call with the :file:`config/config.yml` Rougail configuration file
+
+   rougail -v 1.1 -m firefox -u file -ff config/01/config.yaml
+
+Let us clarify this essential point:
+
+- the integrator works on dictionaries
+- the operator works on configuration files
+    
+.. note:: Most of the time, the integrator and the operator are one and the same person, here we are talking about roles and not necessarily about people.    
+
+Variable's type
+-----------------
+
+If the `type` attribute is not set, Rougail infers a `string` type for the `proxy_mode` configuration option variable type as defined in the structure file.
+
+If the operator sets an option value for example with the `number` type, like this:
+
+.. code-block:: yaml
+
+    ---
+    example_var:
+      description: Configure Proxy Access to the Internet
+      type: number
+
+Then Rougail will expect a `int` or a `float` as a value for the `example_var` variable.
+In our firefox use case, the real type of the `proxy_mode` variable will be now set as a  `choice` type:
+
+.. type-along:: Defining a choice type
+
+    A choice type variable is a variable where the content is constrained by a list
+
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_013/firefox/00-proxy.yml
+   :linenos:
+   :language: yaml
+   :caption: The real :file:`firefox/proxy.yml` Rougail dictionnary file with a choice type
+   :name: RougailDictionaryChoiceType
+
+..
+    ---
+    proxy_mode:
+      description: Configure Proxy Access to the Internet
+      type: choice
+      choices:
+        - No proxy
+        - Auto-detect proxy settings for this network
+        - Use system proxy settings
+        - Manual proxy configuration
+        - Automatic proxy configuration URL
+      default: No proxy
+
+- Then if we run the Rougail CLI 
+
+.. code-block:: text
+   :class: terminal
+   
+    rougail -v 1.1 -m firefox/
+
+We will have an output like this: 
+
+.. raw:: html
+   :url: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/commit/v1.1_013/config/01/output_ro.html
+   :class: output
+   
+..
+    <pre>╭────────────────────────── Caption ──────────────────────────╮
+    │ Variable                           <span style="color: #ffd700">Default value</span>            │
+    │ <span style="color: #5c5cff">Undocumented variable</span>              Modified value           │
+    │ <span style="color: #ff0000">Undocumented but modified variable</span> (<span style="color: #00aa00">Original default value</span>) │
+    │ <span style="color: #ffaf00">Unmodifiable variable</span>                                       │
+    ╰─────────────────────────────────────────────────────────────╯
+    Variables:
+    <span style="color: #5c5cff">┗━━ </span>📓 proxy_mode: <span style="color: #ffd700">No proxy</span>
+    </pre>
+
+The `proxy_mode` variable here, implicitely requires a value. It is a :term:`mandatory` variable.
+
+As we set the `proxy_mode` variable as `No proxy` by default, we actually have specified a value, and the value appears in yellow, which means : "set by default". 
+
+Container type
+-----------------
+
+We say that the `proxy_mode` variable is *constrained* (by the `choice` type).
+
+We have the list of the possible (authorized) values:
+
+- `No proxy`
+- `Auto-detect proxy settings for this network`
+- `Use system proxy settings`
+- `Manual proxy configuration`
+- `Automatic proxy configuration URL`
+
+.. glossary::
+
+    choice type
+
+        The `proxy_mode` setting is "choice" (`type: choice`) means that
+        there is a list of available values that can be selected.
+
+.. keypoints:: Key points progress
+
+    Indeed, in the Firefox configuration, it is possible to define several configuration modes, from no proxy at all (`no proxy`) to a kind of automatic configuration mode from a file (`set up proxy configuration from a file`).
+
+
+    **Keywords**
+
+    - :term:`structure file <structure file>`: structure description file
+    - :term:`variable`: an option's name which has a value
+    - a variable's description
+    - a variable's type
+    - a variable's default value
+    - the :term:`integrator` and :term:`operator` roles
+    - a mandatory value
+    - a choice type
+
+    To sum up, we have arrived at this point in writing a structure file like this:
+
+    **Structure description file**
+
+    .. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_013/firefox/00-proxy.yml
+       :linenos:
+       :language: yaml
+       :caption: A Rougail dictionnary file with a variable named `proxy_mode`, with a default value.
+
+..
+
+   .. raw:: text
+
+    ---
+    proxy_mode:
+      description: Configure Proxy Access to the Internet
+      type: choice
+      choices:
+        - No proxy
+        - Auto-detect proxy settings for this network
+        - Use system proxy settings
+        - Manual proxy configuration
+        - Automatic proxy configuration URL
+      default: No proxy
+

docs/tutorial/proxymode.rst

@@ -0,0 +1,112 @@
+The `proxy` family
+====================
+
+
+.. objectives:: Objectives
+
+   We will learn how to:
+
+   - create a :term:`family`
+   - gather variables into a family
+   - make a variable in a variable, which is a family too
+
+
+.. type-along:: Reminders
+
+    - As a prerequisite we have an idea of what a :term:`structure file description <structure file>` is.
+    - We have a :file:`firefox` folder and we are putting all the structure description files in it.
+    - We had at the :term:`structure description file <structure file>`
+
+A `manual` family
+--------------------
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_020/firefox/10-manual.yml
+   :linenos:
+   :language: yaml
+   :caption: A family structure file description named `manual` in the :file:`firefox/10-manual.yml` file
+   :name: RougailFirstDictionary
+
+..
+    ---
+    manual:
+      description: Manual proxy configuration
+      type: family
+
+We can see that we have defined a :term:`family` here, and this family is *empty*
+(that is, the family container contains no variable yet).
+
+.. admonition:: If a family is empty
+
+    We need to specify the :term:`family` type here because if we don't,
+    the Rougail's type engine will infer it by default as a :term:`variable`.
+
+It's because we don't have set any :term:`variable` inside. If we make a YAML block
+(that is, if we indent), the Rougail's type inference engine will implicitely make it a family.
+
+.. note:: The variables, families, etc. will be created in several files for educational purposes.
+          Obviously all the variables can be put in the same file.
+
+A family inside a family
+----------------------------
+
+Creating a family hierarchy is very easy, here is an example
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_021/firefox/10-manual.yml
+   :linenos:
+   :language: yaml
+   :caption: A rougail structure description file with a hierarchy.
+   :name: RougailFirstFamilyHierarchy
+
+..
+    ---
+    manual:
+      description: Manual proxy configuration
+      type: family
+
+      http_proxy:
+        description: HTTP Proxy
+        type: family
+
+Here the `http_proxy` family lives inside the `manual` family.
+
+Put a variable inside a family or a sub family
+--------------------------------------------------
+
+Let's create a variable in its family with a description and a default value.
+The type of this variable is a `choice` type:
+
+.. extinclude:: https://forge.cloud.silique.fr/stove/rougail-tutorials/raw/tag/v1.1_022/firefox/10-manual.yml
+   :linenos:
+   :language: yaml
+   :caption: An `address` variable in the `http_proxy` family
+   :name: RougailVariableInSubFamily
+
+..
+    ---
+    manual:
+      description: Manual proxy configuration
+      type: family
+
+      http_proxy:
+        description: HTTP Proxy
+        type: family
+
+        address:
+          description: HTTP address
+
+The :term:`operator` can then set :term:`a value <value>` to the :confval:`adress` variable
+
+
+.. confval:: address
+   :type: `string` (a *domain name*)
+   :default: None
+
+   This is a setting that controls the value of the answer.
+
+
+.. keypoints:: Key points progress
+
+    **Keywords**
+
+    - :term:`family`, and sub families
+    - variables defined in a family

docs/tutorial/tutorial.rst

@@ -1,114 +1,5 @@
-Tutorial: a real world sample
+The Firefox proxy: the manual configuration
-==============================
+------------------------------------------------
-
-.. demo:: Demonstration : configuring (the setting of) your favorite web browser
-
-    This tutorial shows to you an example of Rougail use on
-    how to set a proxy in the `Mozilla Firefox <https://www.mozilla.org/en-US/firefox/new/>`_ browser.
-
-More precisely, this tutorial aims at reproducing this Mozilla Firefox settings page:
-
-.. image:: images/firefox.png
-
-.. important:: Here we are in the configuration validation use case,
-               that is the values entered by the user have to be validated.
-               It's a common use case, but not the only one.
-
-Let's explain this use case.
-
-The Firefox proxy configuration
--------------------------------------------
-
-The `proxy` family
--------------------
-
-Let's create our first :term:`dictionary`.
-
-.. prerequisites:: Let's create a folder named `dict` and a dictionary file inside
-
-We will put our dictionary files in this folder.
-
-Then let's put our first dictionary file in this folder, named :file:`00-proxy.yml`
-
-.. code-block:: yaml
-   :caption: the :file:`00-proxy.yml` file
-   :linenos:
-
-    ---
-    version: '1.1'
-    proxy:
-      description: Proxy configuration in order to have access to the internet
-      type: family
-
-We can see that we have defined a :term:`family` here, and this family is *empty*
-(that is, the family container contains no variable yet).
-
-.. admonition:: If a family is empty
-
-    We need to specify the :term:`family` type (line 5) here because if we don't,
-    the Rougail's type engine will infer it by default as a :term:`variable`.
-
-It's because we don't have set any :term:`variable` inside.
-
-
-.. note:: The variables will be created in several files for educational purposes.
-          Obviously all the variables can be put in the same file.
-
-
-The proxy's configuration type
-----------------------------------
-
-In the Firefox configuration, it is possible to define several configuration modes,
-from no proxy at all (`no proxy`) to a kind of automatic configuration mode from a file (`set up proxy configuration from a file`).
-
-We're gonna create a first variable in this family with "Proxy mode" as the description.
-Let's create a second :file:`dict/01-proxy_mode.yml` file.
-
-.. code-block:: yaml
-   :caption: the :file:`001-proxy_mode.yml` file
-   :linenos:
-
-    ---
-    version: '1.1'
-    proxy:
-      proxy_mode:
-        description: Proxy mode
-        type: choice
-        choices:
-          - No proxy
-          - Auto-detect proxy settings for this network
-          - Use system proxy settings
-          - Manual proxy configuration
-          - Automatic proxy configuration URL
-        default: No proxy
-
-The `proxy_mode` variable requires a value (that is, `None` is not an option).
-It shall have a value, but what if the user *does not* specify any value?
-There is line 13, a possibility of setting a default value, wich is `No proxy` as the default.
-
-The `proxy_mode` setting is "choice" (`type: choice`) means that
-there is a list of available values that can be selected.
-We say that the `proxy_mode` variable is *constrained* (by choices).
-
-Line 8 to 12, we have the list of the possible (authorized) values:
-
-- No proxy
-- Auto-detect proxy settings for this network
-- Use system proxy settings
-- Manual proxy configuration
-- Automatic proxy configuration URL
-
-Now let's test our first two dictionaries:
-
-
->>> from rougail import Rougail, RougailConfig
->>> from pprint import pprint
->>> RougailConfig['dictionaries_dir'] = ['dict']
->>> rougail = Rougail()
->>> config = rougail.get_config()
->>> config.property.read_only()
->>> pprint(config.value.get(), sort_dicts=False)
-{'rougail.proxy.proxy_mode': 'No proxy'}
 
 The manual mode
 ------------------

docs/variable.rst

@@ -1,27 +1,42 @@
 The variables
-===================
+==============
 
 Synopsis
-------------
+---------
 
 .. glossary::
 
    variable
    variables
 
-        A variable is an abstract black box (container) paired with an associated symbolic name, which contains some defined or undefined quantity of data referred to as a `value`.
+        A variable is an abstract black box (container) paired with an associated symbolic name, wmost often an option configuration, hich contains some defined or undefined data setting referred to as a :term:`value`.
 
-.. discussion:: This definition, makes a heavy use of data typing.
+   value
-                Indeed, depending on the type system definition of the constistency handling system used, variables may only be able to store a specified data type.
-                OK, variables are the containers for storing the values. It has something to do with typing.
-                But this is not just about typing.
 
-Name
+        A value is a variable's setting.
--------------
+        Variable can have a default value, that is a setting defined in the :term:`structure file`,
+        or no value at all, then the value needs to be define later by the :term:`operator`.
 
-Variable's associated symbolic name.
+.. discussion:: Discussion
 
-It's best to follow the :ref:`convention on variable names`.
+    The variable is, by definition, strongly typed.
+    Rougail uses static type definition and even type inference.
+    Indeed, the constistency handling system heavyly relies on the type system definition.
+    Variables may only be able to store a specified data type.
+    OK, variables are the containers for storing the values. It has something to do with typing.
+
+    But consitency handling system is is not just about strong typing. It is more than that.
+
+Names
+------
+
+Variable name
+
+    Variable's associated symbolic name.
+
+.. seealso::
+
+    Have a look at the :ref:`convention on variable naming link <convention on variable names>`.
 
 Shorthand declaration
 ----------------------------
@@ -146,7 +161,7 @@ Parameters
    * - **redefine**
 
        `boolean`
-     - It is possible to define a variable in one :term:`dictionary` and change its behavior in a second :term:`dictionary`. In this case you must explicitly redefine the variable.
+     - It is possible to define a variable in one :term:`structure file` and change its behavior in a second :term:`structure file`. In this case you must explicitly redefine the variable.
 
        **Default value**: `false`
    * - **exists**
@@ -154,14 +169,14 @@ Parameters
        `boolean`
      - This attribute does two things:
 
-         - creates a variable if it does not exist in another :term:`dictionary` (otherwise do nothing), in this case the value of the attribute must be `true`
+         - creates a variable if it does not exist in another :term:`structure file` (otherwise do nothing), in this case the value of the attribute must be `true`
          - in conjunction with the `redefine` attribute set to `true`, only modifies the behavior if it is pre-existing, in which case the attribute's value must be `false`.
 
        **Default value**: `null`
    * - **test**
 
        `list`
-     - The `test` attribute is a special attribute that allows :term:`dictionary` designers to influence a test robot by specifying useful values to test.
+     - The `test` attribute is a special attribute that allows :term:`structure file` designers to influence a test robot by specifying useful values to test.
 
        Concretely, the content of this attribute is recorded in the `information` attribute of the corresponding `Tiramisu` option object.
 

locale/fr/LC_MESSAGES/rougail.po

@@ -1,166 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-10-30 13:21+0100\n"
-"PO-Revision-Date: 2024-10-30 13:39+0100\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-"X-Generator: Poedit 3.5\n"
-
-#: src/rougail/annotator/family.py:142
-msgid "default variable mode \"{0}\" is not a valid mode, valid modes are {1}"
-msgstr ""
-"le mode d'une variable par défaut \"{0}\" n'est pas un mode valide, les "
-"modes valides sont {1}"
-
-#: src/rougail/annotator/family.py:148
-msgid "default family mode \"{0}\" is not a valid mode, valid modes are {1}"
-msgstr ""
-"le mode d'une famille par défaut \"{0}\" n'est pas un mode valide, les modes "
-"valides sont {1}"
-
-#: src/rougail/annotator/family.py:180
-msgid "mode \"{0}\" for \"{1}\" is not a valid mode, valid modes are {2}"
-msgstr ""
-"le mode \"{0}\" pour \"{1}\" n'est pas un mode valide, les modes valides "
-"sont {2}"
-
-#: src/rougail/annotator/family.py:184
-msgid "mode \"{0}\" for \"{1}\" is not a valid mode, no modes are available"
-msgstr ""
-"le mode \"{0}\" pour \"{1}\" n'est pas un mode valide, aucun mode ne sont "
-"définis"
-
-#: src/rougail/annotator/family.py:248
-msgid ""
-"the variable \"{0}\" is mandatory so in \"{1}\" mode but family has the "
-"higher family mode \"{2}\""
-msgstr ""
-"la variable \"{0}\" est obligatoire donc dans le mode \"{1}\" mais la "
-"famille a un mode supérieur \"{2}\""
-
-#: src/rougail/annotator/family.py:286
-msgid ""
-"the follower \"{0}\" is in \"{1}\" mode but leader have the higher mode "
-"\"{2}\""
-msgstr ""
-"la variable suiveuse \"{0}\" a le mode \"{1}\" mais la variable leader a un "
-"mode supérieur \"{2}\""
-
-#: src/rougail/annotator/family.py:319
-msgid ""
-"the family \"{0}\" is in \"{1}\" mode but variables and families inside have "
-"the higher modes \"{2}\""
-msgstr ""
-"la famille \"{0}\" a le mode \"{1}\" mais les variables et les familles à "
-"l'intérieur ont des modes supérieurs \"{2}\""
-
-#: src/rougail/annotator/family.py:337
-msgid ""
-"the variable \"{0}\" is in \"{1}\" mode but family has the higher family "
-"mode \"{2}\""
-msgstr ""
-"la variable \"{0}\" est dans le mode \"{1}\" mais la famille a le mode "
-"supérieur \"{2}\""
-
-#: src/rougail/annotator/value.py:80
-msgid "the follower \"{0}\" without multi attribute can only have one value"
-msgstr ""
-"la variable suiveuse \"{0}\" sans l'attribut multi peut avoir seulement une "
-"valeur"
-
-#: src/rougail/annotator/value.py:96
-msgid "the variable \"{0}\" is multi but has a non list default value"
-msgstr ""
-"la variable \"{0}\" est multiple mais a une valeur par défaut sans être une "
-"liste"
-
-#: src/rougail/annotator/variable.py:192
-msgid ""
-"the variable \"{0}\" has regexp attribut but has not the \"regexp\" type"
-msgstr ""
-"la variable \"{0}\" a un attribut regexp mais n'a pas le type \"regexp\""
-
-#: src/rougail/annotator/variable.py:235
-msgid ""
-"the variable \"{0}\" has choices attribut but has not the \"choice\" type"
-msgstr ""
-"la variable \"{0}\" a un attribut choices mais n'a pas le type \"choice\""
-
-#: src/rougail/annotator/variable.py:263
-msgid ""
-"the variable \"{0}\" has an unvalid default value \"{1}\" should be in {2}"
-msgstr ""
-"la variable \"{0}\" a la valeur par défaut invalide \"{1}\" devrait être {2}"
-
-#: src/rougail/convert.py:268
-msgid ""
-"A variable or a family located in the \"{0}\" namespace shall not be used in "
-"the \"{1}\" namespace"
-msgstr ""
-"Une variable ou une famille localisé dans l'espace de nom \"{0}\" ne devrait "
-"pas être utilisé dans l'espace de nom \"{1}\""
-
-#: src/rougail/convert.py:462
-msgid "unknown type {0} for {1}"
-msgstr "type {0} inconnu pour {1}"
-
-#: src/rougail/convert.py:1323
-msgid "duplicate dictionary file name {0}"
-msgstr "nom de fichier {0} de dictionnaire dupliqué"
-
-#: src/rougail/convert.py:1370
-msgid "Cannot execute annotate multiple time"
-msgstr "Ne peut exécuter l'annotation plusieurs fois"
-
-#: src/rougail/error.py:70
-msgid "{0} in {1}"
-msgstr "{0} dans {1}"
-
-#: src/rougail/structural_commandline/annotator.py:70
-msgid "alternative_name \"{0}\" conflict with \"--help\""
-msgstr "alternative_name \"{0}\" est en conflit avec \"--help\""
-
-#: src/rougail/structural_commandline/annotator.py:73
-msgid "conflict alternative_name \"{0}\": \"{1}\" and \"{2}\""
-msgstr "conflit dans les \"alternative_name\" \"{0}\": \"{1}\" et \"{2}\""
-
-#: src/rougail/structural_commandline/annotator.py:96
-msgid ""
-"negative_description is mandatory for boolean variable, but \"{0}\" hasn't"
-msgstr ""
-"l'attribut negative_description est obligatoire pour des variables "
-"\"boolean\", mais \"{0}\" n'en a pas"
-
-#: src/rougail/structural_commandline/annotator.py:105
-msgid ""
-"negative_description is only available for boolean variable, but \"{0}\" is "
-"\"{1}\""
-msgstr ""
-"l'attribut negative_description est seulement valide pour des variables "
-"\"boolean\", mais \"{0}\" est \"{1}\""
-
-#: src/rougail/update/update.py:741
-msgid "not a XML file: {0}"
-msgstr "fichier XML invalid : {0}"
-
-#: src/rougail/utils.py:58
-msgid ""
-"invalid variable or family name \"{0}\" must only contains lowercase ascii "
-"character, number or _"
-msgstr ""
-"nom invalide pour la variable ou famille \"{0}\" doit seulement contenir des "
-"caractères ascii minuscule, nombre or _"
-
-#: src/rougail/utils.py:120
-msgid "error in jinja \"{0}\" for the variable \"{1}\": {2}"
-msgstr "erreur dans Jinja \"{0}\" pour la variable \"{1}\": {2}"

locale/rougail.pot

@@ -1,117 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-11-04 12:04+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-
-
-#: src/rougail/annotator/family.py:139
-msgid "default variable mode \"{0}\" is not a valid mode, valid modes are {1}"
-msgstr ""
-
-#: src/rougail/annotator/family.py:145
-msgid "default family mode \"{0}\" is not a valid mode, valid modes are {1}"
-msgstr ""
-
-#: src/rougail/annotator/family.py:177
-msgid "mode \"{0}\" for \"{1}\" is not a valid mode, valid modes are {2}"
-msgstr ""
-
-#: src/rougail/annotator/family.py:181
-msgid "mode \"{0}\" for \"{1}\" is not a valid mode, no modes are available"
-msgstr ""
-
-#: src/rougail/annotator/family.py:245
-msgid "the variable \"{0}\" is mandatory so in \"{1}\" mode but family has the higher family mode \"{2}\""
-msgstr ""
-
-#: src/rougail/annotator/family.py:283
-msgid "the follower \"{0}\" is in \"{1}\" mode but leader have the higher mode \"{2}\""
-msgstr ""
-
-#: src/rougail/annotator/family.py:316
-msgid "the family \"{0}\" is in \"{1}\" mode but variables and families inside have the higher modes \"{2}\""
-msgstr ""
-
-#: src/rougail/annotator/family.py:334
-msgid "the variable \"{0}\" is in \"{1}\" mode but family has the higher family mode \"{2}\""
-msgstr ""
-
-#: src/rougail/annotator/value.py:77
-msgid "the follower \"{0}\" without multi attribute can only have one value"
-msgstr ""
-
-#: src/rougail/annotator/value.py:93
-msgid "the variable \"{0}\" is multi but has a non list default value"
-msgstr ""
-
-#: src/rougail/annotator/variable.py:189
-msgid "the variable \"{0}\" has regexp attribut but has not the \"regexp\" type"
-msgstr ""
-
-#: src/rougail/annotator/variable.py:232
-msgid "the variable \"{0}\" has choices attribut but has not the \"choice\" type"
-msgstr ""
-
-#: src/rougail/annotator/variable.py:260
-msgid "the variable \"{0}\" has an unvalid default value \"{1}\" should be in {2}"
-msgstr ""
-
-#: src/rougail/convert.py:281
-msgid "A variable or a family located in the \"{0}\" namespace shall not be used in the \"{1}\" namespace"
-msgstr ""
-
-#: src/rougail/convert.py:475
-msgid "unknown type {0} for {1}"
-msgstr ""
-
-#: src/rougail/convert.py:1345
-msgid "duplicate dictionary file name {0}"
-msgstr ""
-
-#: src/rougail/convert.py:1392
-msgid "Cannot execute annotate multiple time"
-msgstr ""
-
-#: src/rougail/error.py:67
-msgid "{0} in {1}"
-msgstr ""
-
-#: src/rougail/structural_commandline/annotator.py:67
-msgid "alternative_name \"{0}\" conflict with \"--help\""
-msgstr ""
-
-#: src/rougail/structural_commandline/annotator.py:72
-msgid "conflict alternative_name \"{0}\": \"{1}\" and \"{2}\""
-msgstr ""
-
-#: src/rougail/structural_commandline/annotator.py:95
-msgid "negative_description is mandatory for boolean variable, but \"{0}\" hasn't"
-msgstr ""
-
-#: src/rougail/structural_commandline/annotator.py:104
-msgid "negative_description is only available for boolean variable, but \"{0}\" is \"{1}\""
-msgstr ""
-
-#: src/rougail/update/update.py:738
-msgid "not a XML file: {0}"
-msgstr ""
-
-#: src/rougail/utils.py:55
-msgid "invalid variable or family name \"{0}\" must only contains lowercase ascii character, number or _"
-msgstr ""
-
-#: src/rougail/utils.py:117
-msgid "error in jinja \"{0}\" for the variable \"{1}\": {2}"
-msgstr ""
-

pyproject.toml

@@ -4,19 +4,18 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail"
-version = "1.1.1"
+version = "1.0.2"
-authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
+authors = [
-readme = "README.md"
+    {name = "Emmanuel Garette", email = "gnunux@gnunux.info"},
+]
 description = "A consistency handling system that was initially designed in the configuration management"
+readme = "README.md"
 requires-python = ">=3.8"
 classifiers = [
     "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
     "Natural Language :: English",
@@ -24,10 +23,10 @@ classifiers = [
 
 ]
 dependencies = [
-    "ruamel.yaml ~= 0.18.6",
+    "ruamel.yaml ~= 0.17.40",
-    "pydantic ~= 2.9.2",
+    "pydantic ~= 2.5.2",
-    "jinja2 ~= 3.1.4",
+    "jinja2 ~= 3.1.2",
-    "tiramisu >=5.0,<6"
+    "tiramisu ~= 4.1.0"
 ]
 
 [project.optional-dependencies]
@@ -37,14 +36,9 @@ dev = [
     "lxml ~= 5.2.2"
 ]
 
-[project.urls]
-Home = "https://forge.cloud.silique.fr/stove/rougail"
-
-
 [tool.commitizen]
 name = "cz_conventional_commits"
 tag_format = "$version"
-version_scheme = "pep440"
+version_scheme = "semver"
 version_provider = "pep621"
 update_changelog_on_bump = true
-changelog_merge_prerelease = true

src/rougail/__init__.py

@@ -11,25 +11,26 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
+from tiramisu import Config
-from tiramisu import Config, undefined
+from tiramisu.error import PropertiesOptionError
-from tiramisu.error import PropertiesOptionError, LeadershipError, ConfigError
 from warnings import warn
 from typing import List
-from re import compile, findall
 
 from .convert import RougailConvert
 from .config import RougailConfig
@@ -38,23 +39,15 @@ from .object_model import CONVERT_OPTION
 from .utils import normalize_family
 
 
-def tiramisu_display_name(
+def tiramisu_display_name(kls, subconfig) -> str:
-    kls,
-    subconfig,
-    with_quote: bool = False,
-) -> str:
     """Replace the Tiramisu display_name function to display path + description"""
     doc = kls._get_information(subconfig, "doc", None)
     comment = f" ({doc})" if doc and doc != kls.impl_getname() else ""
-    if "{{ identifier }}" in comment:
+    if "{{ suffix }}" in comment:
-        comment = comment.replace("{{ identifier }}", str(subconfig.identifiers[-1]))
+        comment = comment.replace('{{ suffix }}', str(subconfig.suffixes[-1]))
     path = kls.impl_getpath()
-    if "{{ identifier }}" in path and subconfig.identifiers:
+    if "{{ suffix }}" in path:
-        path = path.replace(
+        path = path.replace('{{ suffix }}', normalize_family(str(subconfig.suffixes[-1])))
-            "{{ identifier }}", normalize_family(str(subconfig.identifiers[-1]))
-        )
-    if with_quote:
-        return f'"{path}"{comment}'
     return f"{path}{comment}"
 
 
@@ -84,10 +77,7 @@ class Rougail:
         if not self.config:
             tiram_obj = self.converted.save(self.rougailconfig["tiramisu_cache"])
             optiondescription = {}
-            custom_types = {
+            custom_types = {custom.__name__: custom for custom in self.rougailconfig["custom_types"].values()}
-                custom.__name__: custom
-                for custom in self.rougailconfig["custom_types"].values()
-            }
             exec(tiram_obj, custom_types, optiondescription)  # pylint: disable=W0122
             self.config = Config(
                 optiondescription["option_0"],
@@ -97,230 +87,46 @@ class Rougail:
         return self.config
 
     def get_config(self):
-        warn(
+        warn("get_config is deprecated, use run instead", DeprecationWarning, stacklevel=2)
-            "get_config is deprecated, use run instead",
-            DeprecationWarning,
-            stacklevel=2,
-        )
         return self.run()
 
-    def user_datas(self, user_datas: List[dict]):
+    def user_datas(self,
+                   user_datas: List[dict]):
         values = {}
         errors = []
         warnings = []
         for datas in user_datas:
-            options = datas.get("options", {})
+            for name, data in datas.get('values', {}).items():
-            for name, data in datas.get("values", {}).items():
+                values.setdefault(name, {}).update(data)
-                values[name] = {
+            errors.extend(datas.get('errors', []))
-                    "values": data,
+            warnings.extend(datas.get('warnings', []))
-                    "options": options.copy(),
-                }
-            errors.extend(datas.get("errors", []))
-            warnings.extend(datas.get("warnings", []))
-        self._auto_configure_dynamics(values)
         while values:
             value_is_set = False
-            for option in self._get_variable(self.config):
+            for option in self.config:
-                path = option.path()
+                if option.path() in values and option.index() in values[option.path()]:
-                if path not in values:
+                    try:
-                    path = path.upper()
+                        option.value.set(values[option.path()])
-                    options = values.get(path, {}).get("options", {})
+                        value_is_set = True
-                    if path not in values or options.get("upper") is not True:
+                        values.pop(option.path())
-                        continue
+                    except:
-                else:
+                        pass
-                    options = values[path].get("options", {})
-                value = values[path]["values"]
-                if option.ismulti():
-                    if options.get("multi_separator") and not isinstance(value, list):
-                        value = value.split(options["multi_separator"])
-                        values[path]["values"] = value
-                    if options.get("needs_convert"):
-                        value = [convert_value(option, val) for val in value]
-                        values[path]["values"] = value
-                        values[path]["options"]["needs_convert"] = False
-                elif options.get("needs_convert"):
-                    value = convert_value(option, value)
-                index = option.index()
-                if index is not None:
-                    if not isinstance(value, list) or index >= len(value):
-                        continue
-                    value = value[index]
-                try:
-                    option.value.set(value)
-                    value_is_set = True
-                    if index is not None:
-                        values[path]["values"][index] = undefined
-                        if set(values[path]["values"]) == {undefined}:
-                            values.pop(path)
-                    else:
-                        values.pop(path)
-                except Exception as err:
-                    if path != option.path():
-                        values[option.path()] = values.pop(path)
             if not value_is_set:
                 break
         for path, data in values.items():
-            try:
+            for index, value in data.items():
-                option = self.config.option(path)
+                try:
-                value = data["values"]
+                    print('attention', path, value)
-                if option.isfollower():
+                    self.config.option(path).value.set(value)
-                    for index, val in enumerate(value):
+                    print('pfff')
-                        if val is undefined:
+                except AttributeError as err:
-                            continue
+                    errors.append(str(err))
-                        self.config.option(path, index).value.set(val)
+                except ValueError as err:
-                else:
+                    errors.append(str(err).replace('"', "'"))
-                    option.value.set(value)
+                except PropertiesOptionError as err:
-            except AttributeError as err:
+    #                warnings.append(f'"{err}" but is defined in "{self.filename}"')
-                errors.append(str(err))
+                    warnings.append(str(err))
-            except (ValueError, LeadershipError) as err:
+        return {'errors': errors,
-                # errors.append(str(err).replace('"', "'"))
+                'warnings': warnings,
-                errors.append(str(err))
+                }
-            except PropertiesOptionError as err:
-                #                warnings.append(f'"{err}" but is defined in "{self.filename}"')
-                warnings.append(str(err))
-        return {
-            "errors": errors,
-            "warnings": warnings,
-        }
-
-    def _get_variable(self, config):
-        for subconfig in config:
-            if subconfig.isoptiondescription():
-                yield from self._get_variable(subconfig)
-            else:
-                yield subconfig
-
-    def _auto_configure_dynamics(
-        self,
-        values,
-    ):
-        cache = {}
-        added = []
-        for path, data in list(values.items()):
-            value = data["values"]
-            #            for value in data['values'].items():
-            try:
-                option = self.config.option(path)
-                option.name()
-            except (ConfigError, PropertiesOptionError):
-                pass
-            except AttributeError:
-                config = self.config
-                current_path = ""
-                identifiers = []
-                for name in path.split(".")[:-1]:
-                    if current_path:
-                        current_path += "."
-                    current_path += name
-                    if current_path in cache:
-                        config, identifier = cache[current_path]
-                        identifiers.append(identifier)
-                    else:
-                        tconfig = config.option(name)
-                        try:
-                            tconfig.group_type()
-                            config = tconfig
-                        except AttributeError:
-                            for tconfig in config.list(uncalculated=True):
-                                if tconfig.isdynamic(only_self=True):
-                                    identifier = self._get_identifier(
-                                        tconfig.name(), name
-                                    )
-                                    if identifier is None:
-                                        continue
-                                    dynamic_variable = tconfig.information.get(
-                                        "dynamic_variable",
-                                        None,
-                                    )
-                                    if not dynamic_variable:
-                                        continue
-                                    option_type = self.config.option(
-                                        dynamic_variable
-                                    ).information.get("type")
-                                    if identifiers:
-                                        for s in identifiers:
-                                            dynamic_variable = dynamic_variable.replace(
-                                                "{{ identifier }}", str(s), 1
-                                            )
-                                    if dynamic_variable not in values:
-                                        values[dynamic_variable] = {"values": []}
-                                        added.append(dynamic_variable)
-                                    elif dynamic_variable not in added:
-                                        continue
-                                    config = tconfig
-                                    #                                        option_type = option.information.get('type')
-                                    typ = CONVERT_OPTION.get(option_type, {}).get(
-                                        "func"
-                                    )
-                                    if typ:
-                                        identifier = typ(identifier)
-                                    if (
-                                        identifier
-                                        not in values[dynamic_variable]["values"]
-                                    ):
-                                        values[dynamic_variable]["values"].append(
-                                            identifier
-                                        )
-                                    identifiers.append(identifier)
-                                    cache[current_path] = config, identifier
-                                    break
-            else:
-                if option.isdynamic():
-                    parent_option = self.config.option(path.rsplit(".", 1)[0])
-                    identifiers = self._get_identifier(
-                        parent_option.name(uncalculated=True),
-                        parent_option.name(),
-                    )
-                    dynamic_variable = None
-                    while True:
-                        dynamic_variable = parent_option.information.get(
-                            "dynamic_variable",
-                            None,
-                        )
-                        if dynamic_variable:
-                            break
-                        parent_option = self.config.option(
-                            parent_option.path().rsplit(".", 1)[0]
-                        )
-                        if "." not in parent_option.path():
-                            parent_option = None
-                            break
-                    if not parent_option:
-                        continue
-                    identifiers = parent_option.identifiers()
-                    for identifier in identifiers:
-                        dynamic_variable = dynamic_variable.replace(
-                            "{{ identifier }}", str(identifier), 1
-                        )
-                    if dynamic_variable not in values:
-                        values[dynamic_variable] = {"values": []}
-                        added.append(dynamic_variable)
-                    elif dynamic_variable not in added:
-                        continue
-                    option_type = option.information.get("type")
-                    typ = CONVERT_OPTION.get(option_type, {}).get("func")
-                    if typ:
-                        identifier = typ(identifier)
-                    if identifier not in values[dynamic_variable]["values"]:
-                        values[dynamic_variable]["values"].append(identifier)
-                    cache[option.path()] = option, identifier
-
-    def _get_identifier(self, true_name, name) -> str:
-        regexp = true_name.replace("{{ identifier }}", "(.*)")
-        finded = findall(regexp, name)
-        if len(finded) != 1 or not finded[0]:
-            return
-        return finded[0]
-
-
-def convert_value(option, value):
-    if value == "":
-        return None
-    option_type = option.information.get("type")
-    func = CONVERT_OPTION.get(option_type, {}).get("func")
-    if func:
-        return func(value)
-    return value
-
 
 __all__ = ("Rougail", "RougailConfig", "RougailUpgrade")

src/rougail/annotator/__init__.py

@@ -11,20 +11,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 import importlib.resources
 from os.path import isfile
 from ..utils import load_modules
@@ -37,23 +39,16 @@ def get_level(module):
     return module.level
 
 
-def get_annotators(annotators, module_name, file_name=None):
+def get_annotators(annotators, module_name):
-    if file_name is None:
+    annotators[module_name] = []
-        _module_name = module_name
-    else:
-        _module_name = module_name + "." + file_name
-        full_file_name = f"/{file_name}.py"
-    annotators[_module_name] = []
     for pathobj in importlib.resources.files(module_name).iterdir():
         path = str(pathobj)
         if not path.endswith(".py") or path.endswith("__.py"):
             continue
-        if file_name is not None and not path.endswith(full_file_name):
-            continue
         module = load_modules(module_name, path)
         if "Annotator" not in dir(module):
             continue
-        annotators[_module_name].append(module.Annotator)
+        annotators[module_name].append(module.Annotator)
 
 
 class SpaceAnnotator:  # pylint: disable=R0903
@@ -73,20 +68,20 @@ class SpaceAnnotator:  # pylint: disable=R0903
             get_annotators(ANNOTATORS, extra_annotator)
         for plugin in objectspace.plugins:
             try:
-                get_annotators(ANNOTATORS, f"rougail.{plugin}", "annotator")
+                get_annotators(ANNOTATORS, f'rougail.{plugin}.annotator')
             except ModuleNotFoundError:
                 pass
         annotators = ANNOTATORS["rougail.annotator"].copy()
         for extra_annotator in objectspace.extra_annotators:
             annotators.extend(ANNOTATORS[extra_annotator])
         for plugin in objectspace.plugins:
-            annotators.extend(ANNOTATORS[f"rougail.{plugin}.annotator"])
+            annotators.extend(ANNOTATORS[f'rougail.{plugin}.annotator'])
         annotators = sorted(annotators, key=get_level)
         functions = {}
         functions_files = objectspace.functions_files
         for functions_file in functions_files:
             if isfile(functions_file):
-                loaded_modules = load_modules("function_file", functions_file)
+                loaded_modules = load_modules('function_file', functions_file)
                 for function in dir(loaded_modules):
                     if function.startswith("_"):
                         continue

src/rougail/annotator/family.py

@@ -11,20 +11,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from typing import Optional
 from rougail.i18n import _
 from rougail.error import DictConsistencyError
@@ -64,19 +66,15 @@ class Annotator(Walk):
             return
         self.check_leadership()
         self.remove_empty_families()
-        self.family_description()
+        self.family_names()
         if self.objectspace.modes_level:
             self.modes = {
-                name: Mode(idx) for idx, name in enumerate(self.objectspace.modes_level)
+                name: Mode(idx)
+                for idx, name in enumerate(self.objectspace.modes_level)
             }
             self.default_variable_mode = self.objectspace.default_variable_mode
             self.default_family_mode = self.objectspace.default_family_mode
             self.change_modes()
-        else:
-            for family in self.get_families():
-                self.valid_mode(family)
-            for variable in self.get_variables():
-                self.valid_mode(variable)
         self.convert_help()
 
     def check_leadership(self) -> None:
@@ -97,10 +95,7 @@ class Annotator(Walk):
             if isinstance(family, self.objectspace.family) and not self._has_variable(
                 family.path
             ):
-                if (
+                if self.objectspace.paths.default_namespace is None or "." in family.path:
-                    self.objectspace.paths.default_namespace is None
-                    or "." in family.path
-                ):
                     removed_families.append(family.path)
         removed_families.reverse()
         for family in removed_families:
@@ -118,18 +113,11 @@ class Annotator(Walk):
                 return True
         return False
 
-    def family_description(self) -> None:
+    def family_names(self) -> None:
+        """Set doc, path, ... to family"""
         for family in self.get_families():
             if not family.description:
                 family.description = family.name
-            if family.type == "dynamic" and isinstance(
-                family.dynamic, VariableCalculation
-            ):
-                path = self.objectspace.paths.get_full_path(
-                    family.dynamic.variable,
-                    family.path,
-                )
-                self.objectspace.informations.add(family.path, "dynamic_variable", path)
 
     def change_modes(self):
         """change the mode of variables"""
@@ -137,14 +125,16 @@ class Annotator(Walk):
         default_variable_mode = self.default_variable_mode
         if default_variable_mode not in modes_level:
             msg = _(
-                'default variable mode "{0}" is not a valid mode, valid modes are {1}'
+                f'default variable mode "{default_variable_mode}" is not a valid mode, '
-            ).format(default_variable_mode, modes_level)
+                f"valid modes are {modes_level}"
+            )
             raise DictConsistencyError(msg, 72, None)
         default_family_mode = self.default_family_mode
         if default_family_mode not in modes_level:
             msg = _(
-                'default family mode "{0}" is not a valid mode, valid modes are {1}'
+                f'default family mode "{default_family_mode}" is not a valid mode, '
-            ).format(default_family_mode, modes_level)
+                f"valid modes are {modes_level}"
+            )
             raise DictConsistencyError(msg, 73, None)
         families = list(self.get_families())
         for family in families:
@@ -154,18 +144,14 @@ class Annotator(Walk):
         for family in families:
             self._change_family_mode(family)
         if self.objectspace.paths.default_namespace is None:
-            for variable_path in self.objectspace.parents["."]:
+            for variable_path in self.objectspace.parents['.']:
                 variable = self.objectspace.paths[variable_path]
-                if (
+                if variable.type == "symlink" or variable_path in self.objectspace.families:
-                    variable.type == "symlink"
-                    or variable_path in self.objectspace.families
-                ):
                     continue
-                self._set_default_mode_variable(
+                self._set_default_mode_variable(variable,
-                    variable,
+                                                self.default_variable_mode,
-                    self.default_variable_mode,
+                                                check_level=False,
-                    check_level=False,
+                                                )
-                )
 
     def valid_mode(
         self,
@@ -173,14 +159,10 @@ class Annotator(Walk):
     ) -> None:
         modes_level = self.objectspace.modes_level
         if self._has_mode(obj) and obj.mode not in modes_level:
-            if modes_level:
+            msg = _(
-                msg = _(
+                f'mode "{obj.mode}" for "{obj.name}" is not a valid mode, '
-                    'mode "{0}" for "{1}" is not a valid mode, valid modes are {2}'
+                f"valid modes are {modes_level}"
-                ).format(obj.mode, obj.name, modes_level)
+            )
-            else:
-                msg = _(
-                    'mode "{0}" for "{1}" is not a valid mode, no modes are available'
-                ).format(obj.mode, obj.name)
             raise DictConsistencyError(msg, 71, obj.xmlfiles)
 
     def _set_default_mode(
@@ -223,7 +205,7 @@ class Annotator(Walk):
         self,
         variable: "self.objectspace.variable",
         family_mode: Optional[str],
-        check_level: bool = True,
+        check_level: bool=True,
     ) -> None:
         # auto_save variable is set to 'basic' mode
         # if its mode is not defined by the user
@@ -237,14 +219,11 @@ class Annotator(Walk):
             and variable.path not in self.objectspace.default_multi
         ):
             variable_mode = self.objectspace.modes_level[0]
-            if (
+            if check_level and family_mode and self.modes[variable_mode] < self.modes[family_mode]:
-                check_level
-                and family_mode
-                and self.modes[variable_mode] < self.modes[family_mode]
-            ):
                 msg = _(
-                    'the variable "{0}" is mandatory so in "{1}" mode but family has the higher family mode "{2}"'
+                    f'the variable "{variable.name}" is mandatory so in "{variable_mode}" mode '
-                ).format(variable.name, variable_mode, family_mode)
+                    f'but family has the higher family mode "{family_mode}"'
+                )
                 raise DictConsistencyError(msg, 36, variable.xmlfiles)
 
             variable.mode = variable_mode
@@ -267,7 +246,9 @@ class Annotator(Walk):
         if leader == follower:
             # it's a leader
             if not leader.mode:
-                self._set_auto_mode(leader, self.default_variable_mode)
+                self._set_auto_mode(
+                    leader, self.default_variable_mode
+                )
             return
         if self._has_mode(follower):
             follower_mode = follower.mode
@@ -281,8 +262,9 @@ class Annotator(Walk):
                 # leader's mode is minimum level
                 if self._has_mode(follower):
                     msg = _(
-                        'the follower "{0}" is in "{1}" mode but leader have the higher mode "{2}"'
+                        f'the follower "{follower.name}" is in "{follower_mode}" mode '
-                    ).format(follower.name, follower_mode, leader.mode)
+                        f'but leader have the higher mode "{leader.mode}"'
+                    )
                     raise DictConsistencyError(msg, 63, follower.xmlfiles)
                 self._set_auto_mode(follower, leader.mode)
 
@@ -313,9 +295,8 @@ class Annotator(Walk):
             # set the lower variable mode to family
             self._set_auto_mode(family, min_variable_mode)
         if self.modes[family.mode] < self.modes[min_variable_mode]:
-            msg = _(
+            msg = _(f'the family "{family.name}" is in "{family.mode}" mode but variables and '
-                'the family "{0}" is in "{1}" mode but variables and families inside have the higher modes "{2}"'
+                    f'families inside have the higher modes "{min_variable_mode}"')
-            ).format(family.name, family.mode, min_variable_mode)
             raise DictConsistencyError(msg, 62, family.xmlfiles)
 
     def _change_variable_mode(
@@ -332,8 +313,9 @@ class Annotator(Walk):
         if not is_follower and self.modes[variable_mode] < self.modes[family_mode]:
             if self._has_mode(variable):
                 msg = _(
-                    'the variable "{0}" is in "{1}" mode but family has the higher family mode "{2}"'
+                    f'the variable "{variable.name}" is in "{variable_mode}" mode '
-                ).format(variable.name, variable_mode, family_mode)
+                    f'but family has the higher family mode "{family_mode}"'
+                )
                 raise DictConsistencyError(msg, 61, variable.xmlfiles)
             self._set_auto_mode(variable, family_mode)
         if not variable.mode:

src/rougail/annotator/property.py

@@ -11,20 +11,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from typing import Union
 from rougail.i18n import _
 from rougail.error import DictConsistencyError
@@ -121,7 +123,7 @@ class Annotator(Walk):
                 value = []
                 for calculation in frozen:
                     calculation_copy = calculation.copy()
-                    calculation_copy.attribute_name = "frozen"
+                    calculation_copy.attribute_name = 'frozen'
                     calculation_copy.ori_path = calculation_copy.path
                     calculation_copy.path = path
                     value.append(calculation_copy)

src/rougail/annotator/value.py

@@ -11,20 +11,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from rougail.annotator.variable import Walk
 
 from rougail.i18n import _
@@ -53,7 +55,7 @@ class Annotator(Walk):  # pylint: disable=R0903
         for variable in self.get_variables():
             if variable.type == "symlink":
                 continue
-            if variable.version != "1.0" and variable.type == "port":
+            if variable.version != '1.0' and variable.type == 'port':
                 self._convert_port(variable)
             self._convert_value(variable)
 
@@ -75,24 +77,24 @@ class Annotator(Walk):  # pylint: disable=R0903
                 raise DictConsistencyError(msg, 68, variable.xmlfiles)
             if variable.path in self.objectspace.followers and multi != "submulti":
                 msg = _(
-                    'the follower "{0}" without multi attribute can only have one value'
+                    f'the follower "{variable.name}" without multi attribute can only have one value'
-                ).format(variable.name)
+                )
                 raise DictConsistencyError(msg, 87, variable.xmlfiles)
             if not variable.default:
                 variable.default = None
             else:
                 if variable.path not in self.objectspace.leaders:
                     if multi == "submulti":
-                        self.objectspace.default_multi[variable.path] = variable.default
+                        self.objectspace.default_multi[
+                            variable.path
+                        ] = variable.default
                         variable.default = None
                     else:
-                        self.objectspace.default_multi[variable.path] = (
+                        self.objectspace.default_multi[variable.path] = variable.default[
-                            variable.default[0]
+                            0
-                        )
+                        ]
         elif variable.multi:
-            msg = _(
+            msg = _(f'the variable "{variable.name}" is multi but has a non list default value')
-                'the variable "{0}" is multi but has a non list default value'
-            ).format(variable.name)
             raise DictConsistencyError(msg, 12, variable.xmlfiles)
         elif variable.path in self.objectspace.followers:
             self.objectspace.default_multi[variable.path] = variable.default

src/rougail/annotator/variable.py

@@ -11,18 +11,21 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
 from rougail.i18n import _
@@ -63,23 +66,20 @@ class Annotator(Walk):  # pylint: disable=R0903
             return
         self.objectspace = objectspace
         if self.objectspace.main_namespace:
-            self.forbidden_name = [self.objectspace.main_namespace]
+            self.forbidden_name = [
+                self.objectspace.main_namespace
+            ]
             for extra in self.objectspace.extra_dictionaries:
                 self.forbidden_name.append(extra)
         else:
             self.forbidden_name = []
         # default type inference from a default value with :term:`basic types`
-        self.basic_types = {
+        self.basic_types = {str: "string", int: "number", bool: "boolean", float: "float"}
-            str: "string",
-            int: "number",
-            bool: "boolean",
-            float: "float",
-        }
-        self.verify_choices()
         self.convert_variable()
         self.convert_test()
         self.convert_examples()
         self.convert_help()
+        self.verify_choices()
 
     def convert_variable(self):
         """convert variable"""
@@ -97,12 +97,14 @@ class Annotator(Walk):  # pylint: disable=R0903
                 variable.multi = False
             if variable.type is None:
                 variable.type = "string"
-            self.objectspace.informations.add(variable.path, "type", variable.type)
+            self.objectspace.informations.add(
+                variable.path, "type", variable.type
+            )
             self._convert_variable(variable)
 
     def _convert_variable_inference(
-        self,
+            self,
-        variable,
+            variable,
     ) -> None:
         # variable has no type
         if variable.type is None:
@@ -118,32 +120,23 @@ class Annotator(Walk):  # pylint: disable=R0903
                     tested_value = variable.default
                 variable.type = self.basic_types.get(type(tested_value), None)
         # variable has no multi attribute
-        if variable.multi is None and not (
+        if variable.multi is None and not (variable.type is None and isinstance(variable.default, VariableCalculation)):
-            variable.type is None and isinstance(variable.default, VariableCalculation)
-        ):
             if variable.path in self.objectspace.leaders:
                 variable.multi = True
             else:
                 variable.multi = isinstance(variable.default, list)
 
     def _default_variable_copy_informations(
-        self,
+            self,
-        variable,
+            variable,
     ) -> None:
         # if a variable has a variable as default value, that means the type/params or multi should has same value
-        if variable.type is not None or not isinstance(
+        if variable.type is not None or not isinstance(variable.default, VariableCalculation):
-            variable.default, VariableCalculation
-        ):
             return
         # copy type and params
         calculated_variable_path = variable.default.variable
-        calculated_variable, identifier = self.objectspace.paths.get_with_dynamic(
+        calculated_variable, suffix = self.objectspace.paths.get_with_dynamic(
-            calculated_variable_path,
+            calculated_variable_path, variable.default.path_prefix, variable.path, variable.version, variable.namespace, variable.xmlfiles
-            variable.default.path_prefix,
-            variable.path,
-            variable.version,
-            variable.namespace,
-            variable.xmlfiles,
         )
         if calculated_variable is None:
             return
@@ -153,11 +146,7 @@ class Annotator(Walk):  # pylint: disable=R0903
         # copy multi attribut
         if variable.multi is None:
             calculated_path = calculated_variable.path
-            if (
+            if calculated_path in self.objectspace.leaders and variable.path in self.objectspace.followers and calculated_path.rsplit('.')[0] == variable.path.rsplit('.')[0]:
-                calculated_path in self.objectspace.leaders
-                and variable.path in self.objectspace.followers
-                and calculated_path.rsplit(".")[0] == variable.path.rsplit(".")[0]
-            ):
                 variable.multi = False
             else:
                 variable.multi = calculated_variable.multi
@@ -182,16 +171,15 @@ class Annotator(Walk):  # pylint: disable=R0903
             family = self.objectspace.paths[variable.path.rsplit(".", 1)[0]]
             if variable.hidden:
                 family.hidden = variable.hidden
-            #            elif family.hidden:
+            elif family.hidden:
-            #                variable.hidden = family.hidden
+                variable.hidden = family.hidden
             variable.hidden = None
-        if variable.regexp is not None and variable.type != "regexp":
+        if variable.choices is not None and variable.type != 'choice':
-            msg = _(
+            msg = _(f'the variable "{variable.path}" has choices attribut but has not the "choice" type')
-                'the variable "{0}" has regexp attribut but has not the "regexp" type'
+            raise DictConsistencyError(msg, 11, variable.xmlfiles)
-            ).format(variable.path)
+        if variable.regexp is not None and variable.type != 'regexp':
+            msg = _(f'the variable "{variable.path}" has regexp attribut but has not the "regexp" type')
             raise DictConsistencyError(msg, 37, variable.xmlfiles)
-        if variable.mandatory is None:
-            variable.mandatory = True
 
     def convert_test(self):
         """Convert variable tests value"""
@@ -225,20 +213,8 @@ class Annotator(Walk):  # pylint: disable=R0903
 
     def verify_choices(self):
         for variable in self.get_variables():
-            if variable.type is None and variable.choices:
+            if variable.type != 'choice' or variable.default is None:
-                # choice type inference from the `choices` attribute
-                variable.type = "choice"
-            if variable.choices is not None and variable.type != "choice":
-                msg = _(
-                    'the variable "{0}" has choices attribut but has not the "choice" type'
-                ).format(variable.path)
-                raise DictConsistencyError(msg, 11, variable.xmlfiles)
-            if variable.type != "choice":
                 continue
-            if variable.default is None:
-                continue
-            if None in variable.choices and variable.mandatory is None:
-                variable.mandatory = False
             if not isinstance(variable.choices, list):
                 continue
             choices = variable.choices
@@ -257,11 +233,5 @@ class Annotator(Walk):  # pylint: disable=R0903
                 if isinstance(value, Calculation):
                     continue
                 if value not in choices:
-                    msg = _(
+                    msg = _(f'the variable "{variable.path}" has an unvalid default value "{value}" should be in {display_list(choices, separator="or", add_quote=True)}')
-                        'the variable "{0}" has an unvalid default value "{1}" should be in {2}'
-                    ).format(
-                        variable.path,
-                        value,
-                        display_list(choices, separator="or", add_quote=True),
-                    )
                     raise DictConsistencyError(msg, 26, variable.xmlfiles)

src/rougail/config.py

@@ -12,20 +12,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from pathlib import Path
 from tiramisu import Config
 from ruamel.yaml import YAML
@@ -33,14 +35,12 @@ from .utils import _, load_modules, normalize_family
 from .convert import RougailConvert
 
 
-RENAMED = {
+RENAMED = {'dictionaries_dir': 'main_dictionaries',
-    "dictionaries_dir": "main_dictionaries",
+           'variable_namespace': 'main_namespace',
-    "variable_namespace": "main_namespace",
+           'functions_file': 'functions_files',
-    "functions_file": "functions_files",
+           }
-}
+NOT_IN_TIRAMISU = {'custom_types': {},
-NOT_IN_TIRAMISU = {
+                   }
-    "custom_types": {},
-}
 SUBMODULES = None
 
 
@@ -49,27 +49,29 @@ def get_sub_modules():
     if SUBMODULES is None:
         SUBMODULES = {}
         for submodule in Path(__file__).parent.iterdir():
-            if submodule.name.startswith("_") or not submodule.is_dir():
+            if submodule.name.startswith('_') or not submodule.is_dir():
                 continue
-            config_file = submodule / "config.py"
+            config_file = submodule / 'config.py'
             if config_file.is_file():
-                SUBMODULES[submodule.name] = load_modules(
+                SUBMODULES[submodule.name] = load_modules('rougail.' + submodule.name + '.config', str(config_file))
-                    "rougail." + submodule.name + ".config", str(config_file)
-                )
     return SUBMODULES
                     
 
 def get_level(module):
-    return module["level"]
+    return module['level']
 
 
 class _RougailConfig:
-    def __init__(self, backward_compatibility: bool, root, extra_vars: dict):
+    def __init__(self,
+                 backward_compatibility: bool,
+                 root,
+                 extra_vars: dict
+                 ):
         self.backward_compatibility = backward_compatibility
         self.root = root
         self.config = Config(
-            self.root,
+                    self.root,
-        )
+                )
         self.config.property.read_only()
         self.extra_vars = extra_vars
         self.not_in_tiramisu = NOT_IN_TIRAMISU | extra_vars
@@ -79,9 +81,7 @@ class _RougailConfig:
             setattr(self, variable, default_value)
 
     def copy(self):
-        rougailconfig = _RougailConfig(
+        rougailconfig = _RougailConfig(self.backward_compatibility, self.root, self.extra_vars)
-            self.backward_compatibility, self.root, self.extra_vars
-        )
         rougailconfig.config.value.importation(self.config.value.exportation())
         rougailconfig.config.property.importation(self.config.property.exportation())
         rougailconfig.config.property.read_only()
@@ -92,17 +92,16 @@ class _RougailConfig:
             setattr(rougailconfig, variable, value)
         return rougailconfig
 
-    def __setitem__(
+    def __setitem__(self,
-        self,
+                    key,
-        key,
+                    value,
-        value,
+                    ) -> None:
-    ) -> None:
         if key in self.not_in_tiramisu:
             setattr(self, key, value)
         else:
             self.config.property.read_write()
-            if key == "export_with_import":
+            if key == 'export_with_import':
-                key = "not_export_with_import"
+                key = 'not_export_with_import'
             key = RENAMED.get(key, key)
             option = self.config.option(key)
             if option.isoptiondescription() and option.isleadership():
@@ -112,29 +111,30 @@ class _RougailConfig:
                 follower = option.followers()[0]
                 for idx, val in enumerate(value.values()):
                     self.config.option(follower.path(), idx).value.set(val)
-            elif key == "not_export_with_import":
+            elif key == 'not_export_with_import':
                 option.value.set(not value)
             else:
                 option.value.set(value)
             self.config.property.read_only()
 
-    def __getitem__(
+    def __getitem__(self,
-        self,
+                    key,
-        key,
+                    ) -> None:
-    ) -> None:
         if key in self.not_in_tiramisu:
             return getattr(self, key)
-        if key == "export_with_import":
+        if key == 'export_with_import':
-            key = "not_export_with_import"
+            key = 'not_export_with_import'
         option = self.config.option(key)
         if option.isoptiondescription() and option.isleadership():
             return self.get_leadership(option)
         ret = self.config.option(key).value.get()
-        if key == "not_export_with_import":
+        if key == 'not_export_with_import':
             return not ret
         return ret
 
-    def get_leadership(self, option) -> dict:
+    def get_leadership(self,
+                       option
+                       ) -> dict:
         leader = None
         followers = []
         for opt, value in option.value.get().items():
@@ -151,7 +151,7 @@ class _RougailConfig:
             if option.isoptiondescription():
                 yield from self.parse(option)
             elif not option.issymlinkoption():
-                yield f"{option.path()}: {option.value.get()}"
+                yield f'{option.path()}: {option.value.get()}'
 
     def __repr__(self):
         self.config.property.read_write()
@@ -164,17 +164,16 @@ class _RougailConfig:
 
 
 class FakeRougailConvert(RougailConvert):
-    def __init__(
+    def __init__(self,
-        self,
+                 add_extra_options: bool,
-        add_extra_options: bool,
+                 ) -> None:
-    ) -> None:
         self.add_extra_options = add_extra_options
         super().__init__({})
 
     def load_config(self) -> None:
         self.sort_dictionaries_all = False
         self.main_namespace = None
-        self.suffix = ""
+        self.suffix = ''
         self.custom_types = {}
         self.functions_files = []
         self.modes_level = []
@@ -182,20 +181,19 @@ class FakeRougailConvert(RougailConvert):
         self.base_option_name = "baseoption"
         self.export_with_import = True
         self.internal_functions = []
-        self.plugins = ["structural_commandline"]
+        self.plugins = ['structural_commandline']
         self.add_extra_options = self.add_extra_options
 
 
-def get_rougail_config(
+def get_rougail_config(*,
-    *,
+                       backward_compatibility: bool=True,
-    backward_compatibility: bool = True,
+                       add_extra_options: bool=True,
-    add_extra_options: bool = True,
+                       ) -> _RougailConfig:
-) -> _RougailConfig:
     if backward_compatibility:
-        main_namespace_default = "rougail"
+        main_namespace_default = 'rougail'
     else:
-        main_namespace_default = "null"
+        main_namespace_default = 'null'
-    rougail_options = f"""default_dictionary_format_version:
+    rougail_options = """default_dictionary_format_version:
   description: Dictionary format version by default, if not specified in dictionary file
   alternative_name: v
   choices:
@@ -221,7 +219,7 @@ sort_dictionaries_all:
 
 main_namespace:
   description: Main namespace name
-  default: {main_namespace_default}
+  default: MAIN_MAMESPACE_DEFAULT
   alternative_name: s
   mandatory: false
 
@@ -291,29 +289,18 @@ functions_files:
 
 modes_level:
   description: All modes level available
-  multi: true
-  mandatory: false
-"""
-    if backward_compatibility:
-        rougail_options += """
   default:
     - basic
     - standard
     - advanced
-"""
+  commandline: false
-    rougail_options += """
+
 default_family_mode:
   description: Default mode for a family
   default:
+    type: jinja
     jinja: |
-      {% if modes_level %}
       {{ modes_level[0] }}
-      {% endif %}
-  disabled:
-    jinja: |
-      {% if not modes_level %}
-      No mode
-      {% endif %}
   validators:
     - type: jinja
       jinja: |
@@ -325,19 +312,9 @@ default_family_mode:
 default_variable_mode:
   description: Default mode for a variable
   default:
+    type: jinja
     jinja: |
-      {% if modes_level %}
-        {% if modes_level | length == 1 %}
-      {{ modes_level[0] }}
-        {% else %}
       {{ modes_level[1] }}
-        {% endif %}
-      {% endif %}
-  disabled:
-    jinja: |
-      {% if not modes_level %}
-      No mode
-      {% endif %}
   validators:
     - type: jinja
       jinja: |
@@ -387,15 +364,14 @@ suffix:
   default: ''
   mandatory: false
   commandline: false
-"""
+""".replace('MAIN_MAMESPACE_DEFAULT', main_namespace_default)
-    processes = {
+    processes = {'structural': [],
-        "structural": [],
+                 'output': [],
-        "output": [],
+                 'user data': [],
-        "user data": [],
+                 }
-    }
     for module in get_sub_modules().values():
         data = module.get_rougail_config()
-        processes[data["process"]].append(data)
+        processes[data['process']].append(data)
     # reorder
     for process in processes:
         processes[process] = list(sorted(processes[process], key=get_level))
@@ -410,22 +386,17 @@ suffix:
     description: Select for {NAME}
     alternative_name: {NAME[0]}
     choices:
-""".format(
+""".format(NAME=normalize_family(process),
-                NAME=normalize_family(process),
+           )
-            )
             for obj in objects:
                 rougail_process += f"      - {obj['name']}\n"
-            if process == "structural":
+            if process == 'structural':
                 rougail_process += "    commandline: false"
-            elif process == "user data":
+            elif process == 'user data':
                 rougail_process += """    multi: true
     mandatory: false
 """
-                hidden_outputs = [
+                hidden_outputs = [process['name'] for process in processes['output'] if not process.get('allow_user_data', True)]
-                    process["name"]
-                    for process in processes["output"]
-                    if not process.get("allow_user_data", True)
-                ]
                 if hidden_outputs:
                     rougail_process += """    hidden:
       type: jinja
@@ -435,63 +406,49 @@ suffix:
                         rougail_process += """        {% if _.output == 'NAME' %}
         Cannot load user data for NAME output
         {% endif %}
-""".replace(
+""".replace('NAME', hidden_output)
-                            "NAME", hidden_output
-                        )
-            elif objects:
-                rougail_process += "    default: {DEFAULT}".format(
-                    DEFAULT=objects[0]["name"]
-                )
-        else:
-            if process == 'output':
-                prop = 'hidden'
             else:
-                prop = 'disabled'
+                rougail_process += '    default: {DEFAULT}'.format(DEFAULT=objects[0]['name'])
+        else:
             rougail_process += """
   {NAME}:
     description: Select for {NAME}
+    hidden: true
     mandatory: false
-    {PROP}: true
     multi: true
-    default: ["You haven't installed \\\"{NAME}\\\" package for rougail"]
+""".format(NAME=normalize_family(process),
-    validators:
+           )
-      - jinja: Please install a rougail-{NAME}-* package.
-""".format(
-                NAME=normalize_family(process),
-                PROP=prop,
-            )
     rougail_options += rougail_process
     convert = FakeRougailConvert(add_extra_options)
     convert._init()
     convert.namespace = None
     convert.parse_root_file(
-        "rougail.config",
+        'rougail.config',
-        "",
+        '',
-        "1.1",
+        '1.1',
         YAML().load(rougail_options),
     )
     extra_vars = {}
     for process in processes:
         for obj in processes[process]:
-            if "extra_vars" in obj:
+            if 'extra_vars' in obj:
-                extra_vars |= obj["extra_vars"]
+                extra_vars |= obj['extra_vars']
-            if not "options" in obj:
+            if not 'options' in obj:
                 continue
             convert.parse_root_file(
                 f'rougail.config.{obj["name"]}',
-                "",
+                '',
-                "1.1",
+                '1.1',
-                YAML().load(obj["options"]),
+                YAML().load(obj['options']),
             )
             
     tiram_obj = convert.save(None)
     optiondescription = {}
     exec(tiram_obj, {}, optiondescription)  # pylint: disable=W0122
-    return _RougailConfig(
+    return _RougailConfig(backward_compatibility,
-        backward_compatibility,
+                          optiondescription["option_0"],
-        optiondescription["option_0"],
+                          extra_vars=extra_vars,
-        extra_vars=extra_vars,
+                          )
-    )
 
 
 RougailConfig = get_rougail_config()

src/rougail/convert.py

@@ -12,20 +12,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 import logging
 from itertools import chain
 from pathlib import Path
@@ -52,6 +54,7 @@ from warnings import warn
 from tiramisu.error import display_list
 
 from .annotator import SpaceAnnotator
+from .error import DictConsistencyError
 from .i18n import _
 from .object_model import CONVERT_OPTION  # Choice,
 from .object_model import (
@@ -130,11 +133,10 @@ class Paths:
         if not force and is_dynamic:
             self._dynamics[path] = dynamic
 
-    def get_full_path(
+    def get_relative_path(self,
-        self,
+                          path: str,
-        path: str,
+                          current_path: str,
-        current_path: str,
+                          ):
-    ):
         relative, subpath = path.split(".", 1)
         relative_len = len(relative)
         path_len = current_path.count(".")
@@ -146,82 +148,61 @@ class Paths:
     def get_with_dynamic(
         self,
         path: str,
-        identifier_path: str,
+        suffix_path: str,
         current_path: str,
         version: str,
         namespace: str,
         xmlfiles: List[str],
     ) -> Any:
-        identifier = None
+        suffix = None
-        if version != "1.0" and self.regexp_relative.search(path):
+        if version != '1.0' and self.regexp_relative.search(path):
-            path = self.get_full_path(
+            path = self.get_relative_path(path,
-                path,
+                                          current_path,
-                current_path,
+                                          )
-            )
         else:
-            path = get_realpath(path, identifier_path)
+            path = get_realpath(path, suffix_path)
         dynamic = None
-        # version 1.0
+        if not path in self._data and "{{ suffix }}" not in path:
-        if version == "1.0":
+            new_path = None
-            if not path in self._data and "{{ suffix }}" not in path:
-                new_path = None
-                current_path = None
-                identifiers = []
-                for name in path.split("."):
-                    parent_path = current_path
-                    if current_path:
-                        current_path += "." + name
-                    else:
-                        current_path = name
-                    if current_path in self._data:
-                        if new_path:
-                            new_path += "." + name
-                        else:
-                            new_path = name
-                        continue
-                    for dynamic_path in self._dynamics:
-                        if "." in dynamic_path:
-                            parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
-                        else:
-                            parent_dynamic = None
-                            name_dynamic = dynamic_path
-                        if (
-                            parent_dynamic == parent_path
-                            and name_dynamic.endswith("{{ identifier }}")
-                            and name == name_dynamic.replace("{{ identifier }}", "")
-                        ):
-                            new_path += "." + name_dynamic
-                            break
-                        regexp = "^" + name_dynamic.replace("{{ identifier }}", "(.*)")
-                        finded = findall(regexp, name)
-                        if len(finded) != 1 or not finded[0]:
-                            continue
-                        if finded[0] == "{{ identifier }}":
-                            identifiers.append(None)
-                        else:
-                            identifiers.append(finded[0])
-                        if new_path is None:
-                            new_path = name_dynamic
-                        else:
-                            new_path += "." + name_dynamic
-                        parent_path = dynamic_path
-                        break
-                    else:
-                        if new_path:
-                            new_path += "." + name
-                        else:
-                            new_path = name
-                path = new_path
-            else:
-                identifiers = None
-                if "{{ suffix }}" in path:
-                    path = path.replace("{{ suffix }}", "{{ identifier }}")
-        elif not path in self._data:
             current_path = None
-            parent_path = None
-            new_path = current_path
-            identifiers = []
             for name in path.split("."):
+                parent_path = current_path
+                if current_path:
+                    current_path += "." + name
+                else:
+                    current_path = name
+                if current_path in self._data:
+                    if new_path:
+                        new_path += "." + name
+                    else:
+                        new_path = name
+                    continue
+                for dynamic_path in self._dynamics:
+                    if '.' in dynamic_path:
+                        parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
+                    else:
+                        parent_dynamic = None
+                        name_dynamic = dynamic_path
+                    if (
+                        version == "1.0"
+                        and parent_dynamic == parent_path
+                        and name_dynamic.endswith("{{ suffix }}")
+                        and name == name_dynamic.replace("{{ suffix }}", "")
+                    ):
+                        new_path += "." + name_dynamic
+                        break
+                else:
+                    if new_path:
+                        new_path += "." + name
+                    else:
+                        new_path = name
+            path = new_path
+        if not path in self._data:
+            current_path = None
+            new_path = current_path
+            suffixes = []
+            for name in path.split("."):
+                parent_path = current_path
                 if current_path:
                     current_path += "." + name
                 else:
@@ -232,44 +213,38 @@ class Paths:
                         new_path += "." + name
                     else:
                         new_path = name
-                    parent_path = current_path
                     continue
                 for dynamic_path in self._dynamics:
-                    if "." in dynamic_path:
+                    if '.' in dynamic_path:
                         parent_dynamic, name_dynamic = dynamic_path.rsplit(".", 1)
                     else:
                         parent_dynamic = None
                         name_dynamic = dynamic_path
                     if (
-                        "{{ identifier }}" not in name_dynamic
+                        "{{ suffix }}" not in name_dynamic
                         or parent_path != parent_dynamic
                     ):
                         continue
-                    regexp = "^" + name_dynamic.replace("{{ identifier }}", "(.*)")
+                    regexp = "^" + name_dynamic.replace("{{ suffix }}", "(.*)")
                     finded = findall(regexp, name)
                     if len(finded) != 1 or not finded[0]:
                         continue
-                    if finded[0] == "{{ identifier }}":
+                    suffixes.append(finded[0])
-                        identifiers.append(None)
-                    else:
-                        identifiers.append(finded[0])
                     if new_path is None:
                         new_path = name_dynamic
                     else:
                         new_path += "." + name_dynamic
-                    parent_path = dynamic_path
                     break
                 else:
                     if new_path:
                         new_path += "." + name
                     else:
                         new_path = name
-                    if "{{ identifier }}" in name:
+                    if "{{ suffix }}" in name:
-                        identifiers.append(None)
+                        suffixes.append(None)
-                    parent_path = current_path
             path = new_path
         else:
-            identifiers = None
+            suffixes = None
         if path not in self._data:
             return None, None
         option = self._data[path]
@@ -279,10 +254,11 @@ class Paths:
             and namespace != option_namespace
         ):
             msg = _(
-                'A variable or a family located in the "{0}" namespace shall not be used in the "{1}" namespace'
+                f'A variable or a family located in the "{option_namespace}" namespace '
-            ).format(option_namespace, namespace)
+                f'shall not be used in the "{namespace}" namespace'
+            )
             raise DictConsistencyError(msg, 38, xmlfiles)
-        return option, identifiers
+        return option, suffixes
 
     def __getitem__(
         self,
@@ -340,8 +316,8 @@ class Informations:
 
 class ParserVariable:
     def __init__(self, rougailconfig):
+        self.load_config(rougailconfig)
         self.rougailconfig = rougailconfig
-        self.load_config()
         self.paths = Paths(self.main_namespace)
         self.families = []
         self.variables = []
@@ -366,34 +342,27 @@ class ParserVariable:
         self.is_init = False
         super().__init__()
 
-    def load_config(self) -> None:
+    def load_config(self,
-        rougailconfig = self.rougailconfig
+                    rougailconfig: 'RougailConfig',
-        self.sort_dictionaries_all = rougailconfig["sort_dictionaries_all"]
+                    ) -> None:
-        try:
+        self.rougailconfig = rougailconfig
-            self.main_dictionaries = rougailconfig["main_dictionaries"]
-        except:
-            self.main_dictionaries = []
         self.main_namespace = rougailconfig["main_namespace"]
+        self.main_dictionaries = rougailconfig["main_dictionaries"]
         if self.main_namespace:
             self.extra_dictionaries = rougailconfig["extra_dictionaries"]
         self.suffix = rougailconfig["suffix"]
-        self.default_dictionary_format_version = rougailconfig[
+        self.default_dictionary_format_version = rougailconfig["default_dictionary_format_version"]
-            "default_dictionary_format_version"
-        ]
         self.custom_types = rougailconfig["custom_types"]
         self.functions_files = rougailconfig["functions_files"]
         self.modes_level = rougailconfig["modes_level"]
-        if self.modes_level:
+        self.default_variable_mode = rougailconfig["default_variable_mode"]
-            self.default_variable_mode = rougailconfig["default_variable_mode"]
+        self.default_family_mode = rougailconfig["default_family_mode"]
-            self.default_family_mode = rougailconfig["default_family_mode"]
         self.extra_annotators = rougailconfig["extra_annotators"]
         self.base_option_name = rougailconfig["base_option_name"]
         self.export_with_import = rougailconfig["export_with_import"]
         self.internal_functions = rougailconfig["internal_functions"]
-        self.add_extra_options = rougailconfig[
+        self.add_extra_options = rougailconfig["structural_commandline.add_extra_options"]
-            "structural_commandline.add_extra_options"
+        self.plugins = []
-        ]
-        self.plugins = rougailconfig["plugins"]
 
     def _init(self):
         if self.is_init:
@@ -403,22 +372,14 @@ class ParserVariable:
         if self.plugins:
             root = Path(__file__).parent
             for plugin in self.plugins:
-                module_path = root / plugin / "object_model.py"
+                module_path = root / plugin / 'object_model.py'
                 if not module_path.is_file():
                     continue
-                module = load_modules(
+                module = load_modules(f'rougail.{plugin}.object_model', str(module_path))
-                    f"rougail.{plugin}.object_model", str(module_path)
+                if 'Variable' in module.__all__:
-                )
+                    variable = type(variable.__name__ + '_' + plugin, (variable, module.Variable), {})
-                if "Variable" in module.__all__:
+                if 'Family' in module.__all__:
-                    variable = type(
+                    family = type(family.__name__ + '_' + plugin, (family, module.Family), {})
-                        variable.__name__ + "_" + plugin,
-                        (variable, module.Variable),
-                        {},
-                    )
-                if "Family" in module.__all__:
-                    family = type(
-                        family.__name__ + "_" + plugin, (family, module.Family), {}
-                    )
         self.variable = variable
         self.family = family
         self.dynamic = type(Dynamic.__name__, (Dynamic, family), {})
@@ -472,7 +433,7 @@ class ParserVariable:
                 return "family"
             if obj_type in self.variable_types:
                 return "variable"
-            msg = _("unknown type {0} for {1}").format(obj_type, path)
+            msg = f"unknown type {obj_type} for {path}"
             raise DictConsistencyError(msg, 43, [filename])
         # in a leadership there is only variable
         if family_is_leadership:
@@ -483,15 +444,11 @@ class ParserVariable:
             extra_keys = set(obj) - self.variable_attrs
             if not extra_keys:
                 for key, value in obj.items():
-                    if (
+                    if isinstance(value, dict) and not self.is_calculation(
-                        isinstance(value, dict)
+                        key,
-                        and key != "params"
+                        value,
-                        and not self.is_calculation(
+                        self.variable_calculations,
-                            key,
+                        False,
-                            value,
-                            self.variable_calculations,
-                            False,
-                        )
                     ):
                         break
                 else:
@@ -600,10 +557,8 @@ class ParserVariable:
             # it's just for modify subfamily or subvariable, do not redefine
             if family_obj:
                 if not obj.pop("redefine", False):
-                    raise DictConsistencyError(
+                    raise Exception(
-                        f'The family "{path}" already exists and it is not redefined',
+                        f"The family {path} already exists and she is not redefined in {filename}"
-                        32,
-                        [filename],
                     )
                 # convert to Calculation objects
                 self.parse_parameters(
@@ -638,29 +593,26 @@ class ParserVariable:
             obj_type = self.get_family_or_variable_type(family_obj)
             if obj_type is None:
                 # auto set type
-                if "_dynamic" in family_obj:
+                if '_dynamic' in family_obj:
-                    dynamic = family_obj["_dynamic"]
+                    dynamic = family_obj['_dynamic']
-                elif "dynamic" in family_obj:
+                elif 'dynamic' in family_obj:
-                    dynamic = family_obj["dynamic"]
+                    dynamic = family_obj['dynamic']
                 else:
                     dynamic = None
                 if isinstance(dynamic, (list, dict)):
-                    family_obj["type"] = obj_type = "dynamic"
+                    family_obj['type'] = obj_type = 'dynamic'
             if obj_type == "dynamic":
                 family_is_dynamic = True
-                if "{{ identifier }}" not in name:
-                    if version == "1.0" and "{{ suffix }}" in name:
-                        name = name.replace("{{ suffix }}", "{{ identifier }}")
-                        path = path.replace("{{ suffix }}", "{{ identifier }}")
-                    elif "variable" in family_obj:
-                        name += "{{ identifier }}"
-                        path += "{{ identifier }}"
-                    else:
-                        msg = f'dynamic family name must have "{{{{ identifier }}}}" in his name for "{path}"'
-                        raise DictConsistencyError(msg, 13, [filename])
                 parent_dynamic = path
-            if version != "1.0" and not family_obj and comment:
+                if '{{ suffix }}' not in name:
-                family_obj["description"] = comment
+                    if "variable" in family_obj:
+                        name += '{{ suffix }}'
+                        path += '{{ suffix }}'
+                    else:
+                        msg = f'dynamic family name must have "{{{{ suffix }}}}" in his name for "{path}"'
+                        raise DictConsistencyError(msg, 13, [filename])
+            if version != '1.0' and not family_obj and comment:
+                family_obj['description'] = comment
             self.add_family(
                 path,
                 name,
@@ -716,11 +668,7 @@ class ParserVariable:
                 # it's a dict, so a new variables!
                 continue
             # 'variable' for compatibility to format 1.0
-            if (
+            if key == "variable" and obj.get("type") != "dynamic" and obj.get("_type") != "dynamic":
-                key == "variable"
-                and obj.get("type") != "dynamic"
-                and obj.get("_type") != "dynamic"
-            ):
                 continue
             if key in self.family_attrs:
                 yield key
@@ -765,20 +713,17 @@ class ParserVariable:
                 del family["variable"]
             # FIXME only for 1.0
             if "variable" in family:
-                family["dynamic"] = {
+                family['dynamic'] = {'type': 'variable',
-                    "type": "variable",
+                                     'variable': family['variable'],
-                    "variable": family["variable"],
+                                     'propertyerror': False,
-                    "propertyerror": False,
+                                     'allow_none': True,
-                    "allow_none": True,
+                                     }
-                }
+                del family['variable']
-                del family["variable"]
                 if version != "1.0":
                     warning = f'"variable" attribute in dynamic family "{ path }" is depreciated in {filename}'
                     warn(warning)
             if "variable" in family:
-                raise Exception(
+                raise Exception(f'dynamic family must not have "variable" attribute for "{family["path"]}" in {family["xmlfiles"]}')
-                    f'dynamic family must not have "variable" attribute for "{family["path"]}" in {family["xmlfiles"]}'
-                )
         else:
             family_obj = self.family
         # convert to Calculation objects
@@ -993,7 +938,6 @@ class ParserVariable:
 
         variable["namespace"] = self.namespace
         variable["version"] = version
-        variable["path_prefix"] = self.path_prefix
         variable["xmlfiles"] = filename
         variable_type = self.get_family_or_variable_type(variable)
         obj = {
@@ -1013,7 +957,7 @@ class ParserVariable:
             parent_dynamic,
         )
         self.variables.append(variable["path"])
-        if "." in variable["path"]:
+        if '.' in variable["path"]:
             parent_path = variable["path"].rsplit(".", 1)[0]
         else:
             parent_path = "."
@@ -1031,10 +975,10 @@ class ParserVariable:
         del self.paths[path]
         self.families.remove(path)
         del self.parents[path]
-        if "." in path:
+        if '.' in path:
             parent = path.rsplit(".", 1)[0]
         else:
-            parent = "."
+            parent = '.'
         self.parents[parent].remove(path)
 
     ###############################################################################################
@@ -1047,7 +991,9 @@ class ParserVariable:
     ):
         """Set Tiramisu object name"""
         self.index += 1
-        self.reflector_names[obj.path] = f"{option_prefix}{self.index}{self.suffix}"
+        self.reflector_names[
+            obj.path
+        ] = f'{option_prefix}{self.index}{self.suffix}'
 
     ###############################################################################################
     # calculations
@@ -1066,12 +1012,12 @@ class ParserVariable:
             calculations = calculations[1]
         if not isinstance(value, dict) or attribute not in calculations:
             return False
-        if "type" in value:
+        if 'type' in value:
-            return value["type"] in CALCULATION_TYPES
+            return value['type'] in CALCULATION_TYPES
         # auto set type
         typ = set(CALCULATION_TYPES) & set(value)
         if len(typ) == 1:
-            value["type"] = list(typ)[0]
+            value['type'] = list(typ)[0]
             return True
         return False
 
@@ -1110,7 +1056,7 @@ class ParserVariable:
                     # auto set type
                     param_typ = set(CALCULATION_TYPES) & set(val)
                     if len(param_typ) == 1:
-                        val["type"] = list(param_typ)[0]
+                        val['type'] = list(param_typ)[0]
                 if not isinstance(val, dict) or "type" not in val:
                     param_typ = "any"
                     val = {
@@ -1118,8 +1064,6 @@ class ParserVariable:
                         "type": "any",
                     }
                 else:
-                    if version == "1.0" and val["type"] == "suffix":
-                        val["type"] = "identifier"
                     param_typ = val["type"]
                 val["key"] = key
                 val["path"] = path
@@ -1130,10 +1074,8 @@ class ParserVariable:
                 try:
                     params.append(PARAM_TYPES[param_typ](**val))
                 except ValidationError as err:
-                    raise DictConsistencyError(
+                    raise Exception(
-                        f'"{attribute}" has an invalid "{key}" for {path}: {err}',
+                        f'"{attribute}" has an invalid "{key}" for {path}: {err}'
-                        29,
-                        xmlfiles,
                     ) from err
             calculation_object["params"] = params
         #
@@ -1144,8 +1086,8 @@ class ParserVariable:
                     f'unknown "return_type" in {attribute} of variable "{path}"'
                 )
         #
-        if typ == "identifier" and not family_is_dynamic:
+        if typ == "suffix" and not family_is_dynamic:
-            msg = f'identifier calculation for "{attribute}" in "{path}" cannot be set none dynamic family'
+            msg = f'suffix calculation for "{attribute}" in "{path}" cannot be set none dynamic family'
             raise DictConsistencyError(msg, 53, xmlfiles)
         if attribute in PROPERTY_ATTRIBUTE:
             calc = CALCULATION_PROPERTY_TYPES[typ](**calculation_object)
@@ -1201,20 +1143,19 @@ class RougailConvert(ParserVariable):
         """Parse directories content"""
         self._init()
         if path_prefix:
-            n_path_prefix = normalize_family(path_prefix)
+            if path_prefix in self.parents:
-            if n_path_prefix in self.parents:
                 raise Exception("pfffff")
-            root_parent = n_path_prefix
+            root_parent = path_prefix
-            self.path_prefix = n_path_prefix
+            self.path_prefix = path_prefix
             self.namespace = None
             self.add_family(
-                n_path_prefix,
+                path_prefix,
-                n_path_prefix,
+                path_prefix,
-                {"description": path_prefix},
+                {},
                 "",
                 False,
                 None,
-                "",
+                '',
             )
         else:
             root_parent = "."
@@ -1242,13 +1183,12 @@ class RougailConvert(ParserVariable):
                 for idx, filename in enumerate(self.get_sorted_filename(extra_dirs)):
                     if not idx:
                         self.parse_family(
-                            "",
+                            '',
                             self.namespace,
                             namespace_path,
-                            {
+                            {'description': namespace,
-                                "description": namespace,
+                             },
-                            },
+                            '',
-                            "",
                         )
                     self.parse_variable_file(
                         filename,
@@ -1257,7 +1197,7 @@ class RougailConvert(ParserVariable):
         else:
             self.namespace = None
             if root_parent == ".":
-                namespace_path = ""
+                namespace_path = ''
             else:
                 namespace_path = f"{root_parent}"
             if namespace_path in self.parents:
@@ -1297,20 +1237,18 @@ class RougailConvert(ParserVariable):
         )
         if objects is None:
             return
-        self.parse_root_file(
+        self.parse_root_file(filename,
-            filename,
+                             path,
-            path,
+                             version,
-            version,
+                             objects,
-            objects,
+                             )
-        )
 
-    def parse_root_file(
+    def parse_root_file(self,
-        self,
+                        filename: str,
-        filename: str,
+                        path: str,
-        path: str,
+                        version: str,
-        version: str,
+                        objects: dict,
-        objects: dict,
+                        ) -> None:
-    ) -> None:
         for name, obj in objects.items():
             comment = self.get_comment(name, objects)
             self.family_or_variable(
@@ -1329,28 +1267,21 @@ class RougailConvert(ParserVariable):
         """Sort filename"""
         if not isinstance(directories, list):
             directories = [directories]
-        if self.sort_dictionaries_all:
-            filenames = {}
         for directory_name in directories:
             directory = Path(directory_name)
             if not directory.is_dir():
                 continue
-            if not self.sort_dictionaries_all:
+            filenames = {}
-                filenames = {}
             for file_path in directory.iterdir():
                 if file_path.suffix not in [".yml", ".yaml"]:
                     continue
                 if file_path.name in filenames:
                     raise DictConsistencyError(
-                        _("duplicate dictionary file name {0}").format(file_path.name),
+                        _(f"duplicate dictionary file name {file_path.name}"),
                         78,
                         [filenames[file_path.name][1]],
                     )
                 filenames[file_path.name] = str(file_path)
-            if not self.sort_dictionaries_all:
-                for filename in sorted(filenames):
-                    yield filenames[filename]
-        if self.sort_dictionaries_all:
             for filename in sorted(filenames):
                 yield filenames[filename]
 
@@ -1416,5 +1347,5 @@ class RougailConvert(ParserVariable):
         if filename:
             with open(filename, "w", encoding="utf-8") as tiramisu:
                 tiramisu.write(output)
-        # print(output)
+        #print(output)
         return output

src/rougail/error.py

@@ -11,20 +11,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from .i18n import _
 
 
@@ -64,7 +66,7 @@ class DictConsistencyError(Exception):
 
     def __init__(self, msg, errno, xmlfiles):
         if xmlfiles:
-            msg = _("{0} in {1}").format(msg, display_xmlfiles(xmlfiles))
+            msg = _(f"{msg} in {display_xmlfiles(xmlfiles)}")
         super().__init__(msg)
         self.errno = errno
 
@@ -72,17 +74,13 @@ class DictConsistencyError(Exception):
 class UpgradeError(Exception):
     """Error during XML upgrade"""
 
-
 ## ---- generic exceptions ----
 
-
 class NotFoundError(Exception):
     "not found error"
     pass
     
-
 ## ---- specific exceptions ----
 
-
 class VariableCalculationDependencyError(Exception):
     pass

src/rougail/i18n.py

@@ -10,23 +10,51 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
+import gettext
+import os
+import sys
+import locale
 
-from gettext import translation
+# Application Name
-from pathlib import Path
+APP_NAME = "rougail"
 
-t = translation("rougail", str(Path(__file__).parent / "locale"), fallback=True)
+# Traduction dir
+APP_DIR = os.path.join(sys.prefix, "share")
+LOCALE_DIR = os.path.join(APP_DIR, "locale")
+
+# Default Lanugage
+DEFAULT_LANG = os.environ.get("LANG", "").split(":")
+DEFAULT_LANG += ["en_US"]
+
+languages = []
+lc, encoding = locale.getlocale()
+if lc:
+    languages = [lc]
+
+languages += DEFAULT_LANG
+mo_location = LOCALE_DIR
+
+gettext.find(APP_NAME, mo_location)
+gettext.textdomain(APP_NAME)
+# gettext.bind_textdomain_codeset(APP_NAME, "UTF-8")
+# gettext.translation(APP_NAME, fallback=True)
+
+t = gettext.translation(APP_NAME, fallback=True)
 
 _ = t.gettext

src/rougail/object_model.py

@@ -3,18 +3,21 @@
 Silique (https://www.silique.fr)
 Copyright (C) 2023-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
 from typing import Optional, Union, get_type_hints, Any, Literal, List, Dict, Iterator
@@ -134,16 +137,16 @@ class VariableParam(Param):
     optional: bool = False
 
 
-class IdentifierParam(Param):
+class SuffixParam(Param):
     type: str
-    identifier: Optional[int] = None
+    suffix: Optional[int] = None
 
     def __init__(
         self,
         **kwargs,
     ) -> None:
         if not kwargs["family_is_dynamic"]:
-            msg = f'identifier parameter for "{kwargs["attribute"]}" in "{kwargs["path"]}" cannot be set none dynamic family'
+            msg = f'suffix parameter for "{kwargs["attribute"]}" in "{kwargs["path"]}" cannot be set none dynamic family'
             raise DictConsistencyError(msg, 10, kwargs["xmlfiles"])
         super().__init__(**kwargs)
 
@@ -171,7 +174,7 @@ class IndexParam(Param):
 PARAM_TYPES = {
     "any": AnyParam,
     "variable": VariableParam,
-    "identifier": IdentifierParam,
+    "suffix": SuffixParam,
     "information": InformationParam,
     "index": IndexParam,
 }
@@ -206,7 +209,7 @@ class Calculation(BaseModel):
                     path = self.path
                 else:
                     path = self.ori_path
-                variable, identifier = objectspace.paths.get_with_dynamic(
+                variable, suffix = objectspace.paths.get_with_dynamic(
                     param["variable"],
                     self.path_prefix,
                     path,
@@ -222,15 +225,15 @@ class Calculation(BaseModel):
                 if not isinstance(variable, objectspace.variable):
                     raise Exception("pfff it's a family")
                 param["variable"] = variable
-                if identifier:
+                if suffix:
-                    param["identifier"] = identifier
+                    param["suffix"] = suffix
             if param.get("type") == "information":
                 if param["variable"]:
                     if self.ori_path is None:
                         path = self.path
                     else:
                         path = self.ori_path
-                    variable, identifier = objectspace.paths.get_with_dynamic(
+                    variable, suffix = objectspace.paths.get_with_dynamic(
                         param["variable"],
                         self.path_prefix,
                         path,
@@ -242,7 +245,7 @@ class Calculation(BaseModel):
                         msg = f'cannot find variable "{param["variable"]}" defined in "{self.attribute_name}" for "{self.path}"'
                         raise DictConsistencyError(msg, 14, self.xmlfiles)
                     param["variable"] = variable
-                    if identifier:
+                    if suffix:
                         msg = f'variable "{param["variable"]}" defined in "{self.attribute_name}" for "{self.path}" is a dynamic variable'
                         raise DictConsistencyError(msg, 15, self.xmlfiles)
                 else:
@@ -308,7 +311,7 @@ class JinjaCalculation(Calculation):
             path = self.path
         else:
             path = self.ori_path
-        for sub_variable, identifier, true_path in get_jinja_variable_to_param(
+        for sub_variable, suffix, true_path in get_jinja_variable_to_param(
             path,
             self.jinja,
             objectspace,
@@ -330,10 +333,8 @@ class JinjaCalculation(Calculation):
                     "type": "variable",
                     "variable": sub_variable,
                 }
-                if self.version != "1.0":
+                if suffix:
-                    default["params"][true_path]["propertyerror"] = False
+                    default["params"][true_path]["suffix"] = suffix
-                if identifier:
-                    default["params"][true_path]["identifier"] = identifier
         return default
 
     def to_function(
@@ -402,15 +403,14 @@ class _VariableCalculation(Calculation):
     propertyerror: bool = True
     allow_none: bool = False
 
-    def get_variable(
+    def get_variable(self,
-        self,
+                     objectspace,
-        objectspace,
+                     ) -> "Variable":
-    ) -> "Variable":
         if self.ori_path is None:
             path = self.path
         else:
             path = self.ori_path
-        variable, identifier = objectspace.paths.get_with_dynamic(
+        variable, suffix = objectspace.paths.get_with_dynamic(
             self.variable,
             self.path_prefix,
             path,
@@ -421,13 +421,13 @@ class _VariableCalculation(Calculation):
         if variable and not isinstance(variable, objectspace.variable):
             # FIXME remove the pfff
             raise Exception("pfff it's a family")
-        return variable, identifier
+        return variable, suffix
 
     def get_params(
         self,
         objectspace,
         variable: "Variable",
-        identifier: Optional[str],
+        suffix: Optional[str],
         *,
         needs_multi: Optional[bool] = None,
     ):
@@ -439,8 +439,8 @@ class _VariableCalculation(Calculation):
             "variable": variable,
             "propertyerror": self.propertyerror,
         }
-        if identifier:
+        if suffix:
-            param["identifier"] = identifier
+            param["suffix"] = suffix
         params = {None: [param]}
         if self.default_values:
             params["__default_value"] = self.default_values
@@ -454,7 +454,7 @@ class _VariableCalculation(Calculation):
         calc_variable_is_multi = variable.path in objectspace.multis
         if not calc_variable_is_multi:
             if variable.path in objectspace.paths._dynamics and (
-                identifier is None or identifier[-1] is None
+                suffix is None or suffix[-1] is None
             ):
                 self_dyn_path = objectspace.paths._dynamics.get(self.path)
                 if self_dyn_path is not None:
@@ -465,7 +465,7 @@ class _VariableCalculation(Calculation):
                         calc_variable_is_multi = True
                 else:
                     calc_variable_is_multi = True
-            elif identifier and "{{ identifier }}" in identifier:
+            elif suffix and '{{ suffix }}' in suffix:
                 calc_variable_is_multi = True
         if needs_multi:
             if calc_variable_is_multi:
@@ -479,15 +479,12 @@ class _VariableCalculation(Calculation):
             msg = f'the variable "{self.path}" has an invalid attribute "{self.attribute_name}", it\'s a list'
             raise DictConsistencyError(msg, 23, self.xmlfiles)
         elif calc_variable_is_multi:
-            if (
+            if variable.multi or variable.path.rsplit('.', 1)[0] != self.path.rsplit('.', 1)[0]:
-                variable.multi
-                or variable.path.rsplit(".", 1)[0] != self.path.rsplit(".", 1)[0]
-            ):
                 # it's not a follower or not in same leadership
                 msg = f'the variable "{self.path}" has an invalid attribute "{self.attribute_name}", the variable "{variable.path}" is a multi'
                 raise DictConsistencyError(msg, 21, self.xmlfiles)
             else:
-                params[None][0]["index"] = {"index": {"type": "index"}}
+                params[None][0]['index'] = {'index': {'type': 'index'}}
         return params
 
 
@@ -502,14 +499,13 @@ class VariableCalculation(_VariableCalculation):
         if self.attribute_name != "default" and self.optional:
             msg = f'"{self.attribute_name}" variable shall not have an "optional" attribute for variable "{self.variable}"'
             raise DictConsistencyError(msg, 33, self.xmlfiles)
-        variable, identifier = self.get_variable(objectspace)
+        variable, suffix = self.get_variable(objectspace)
         if not variable and self.optional:
             raise VariableCalculationDependencyError()
-        params = self.get_params(
+        params = self.get_params(objectspace,
-            objectspace,
+                                 variable,
-            variable,
+                                 suffix,
-            identifier,
+                                 )
-        )
         return {
             "function": "calc_value",
             "params": params,
@@ -525,13 +521,11 @@ class VariablePropertyCalculation(_VariableCalculation):
         self,
         objectspace,
     ) -> dict:
-        variable, identifier = self.get_variable(objectspace)
+        variable, suffix = self.get_variable(objectspace)
-        params = self.get_params(
+        params = self.get_params(objectspace,
-            objectspace,
+                                 variable,
-            variable,
+                                 suffix,
-            identifier,
+                                 needs_multi=False,)
-            needs_multi=False,
-        )
         variable = params[None][0]["variable"]
         if self.when is not undefined:
             if self.version == "1.0":
@@ -585,7 +579,7 @@ class InformationCalculation(Calculation):
                 path = self.path
             else:
                 path = self.ori_path
-            variable, identifier = objectspace.paths.get_with_dynamic(
+            variable, suffix = objectspace.paths.get_with_dynamic(
                 self.variable,
                 self.path_prefix,
                 path,
@@ -593,7 +587,7 @@ class InformationCalculation(Calculation):
                 self.namespace,
                 self.xmlfiles,
             )
-            if variable is None or identifier is not None:
+            if variable is None or suffix is not None:
                 raise Exception("pfff")
             params[None][0]["variable"] = variable
         if self.default_values:
@@ -604,33 +598,33 @@ class InformationCalculation(Calculation):
         }
 
 
-class _IdentifierCalculation(Calculation):
+class _SuffixCalculation(Calculation):
-    identifier: Optional[int] = None
+    suffix: Optional[int] = None
 
-    def get_identifier(self) -> dict:
+    def get_suffix(self) -> dict:
-        identifier = {"type": "identifier"}
+        suffix = {"type": "suffix"}
-        if self.identifier is not None:
+        if self.suffix is not None:
-            identifier["identifier"] = self.identifier
+            suffix["suffix"] = self.suffix
-        return identifier
+        return suffix
 
 
-class IdentifierCalculation(_IdentifierCalculation):
+class SuffixCalculation(_SuffixCalculation):
     attribute_name: Literal["default", "choice", "dynamic"]
 
     def to_function(
         self,
         objectspace,
     ) -> dict:
-        identifier = {"type": "identifier"}
+        suffix = {"type": "suffix"}
-        if self.identifier is not None:
+        if self.suffix is not None:
-            identifier["identifier"] = self.identifier
+            suffix["suffix"] = self.suffix
         return {
             "function": "calc_value",
-            "params": {None: [self.get_identifier()]},
+            "params": {None: [self.get_suffix()]},
         }
 
 
-class IdentifierPropertyCalculation(_IdentifierCalculation):
+class SuffixPropertyCalculation(_SuffixCalculation):
     attribute_name: Literal[*PROPERTY_ATTRIBUTE]
     when: Any = undefined
     when_not: Any = undefined
@@ -644,7 +638,7 @@ class IdentifierPropertyCalculation(_IdentifierCalculation):
             raise DictConsistencyError(msg, 105, variable.xmlfiles)
         if self.when is not undefined:
             if self.when_not is not undefined:
-                msg = f'the identifier has an invalid attribute "{self.attribute_name}", when and when_not cannot set together'
+                msg = f'the suffix has an invalid attribute "{self.attribute_name}", when and when_not cannot set together'
                 raise DictConsistencyError(msg, 35, variable.xmlfiles)
             when = self.when
             inverse = False
@@ -652,13 +646,12 @@ class IdentifierPropertyCalculation(_IdentifierCalculation):
             when = self.when_not
             inverse = True
         else:
-            msg = f'the identifier has an invalid attribute "{self.attribute_name}", when and when_not cannot set together'
+            msg = f'the suffix has an invalid attribute "{self.attribute_name}", when and when_not cannot set together'
             raise DictConsistencyError
-        params = {
+        params = {None: [self.attribute_name, self.get_suffix()],
-            None: [self.attribute_name, self.get_identifier()],
+                  "when": when,
-            "when": when,
+                  "inverse": inverse,
-            "inverse": inverse,
+                  }
-        }
         return {
             "function": "variable_to_property",
             "params": params,
@@ -686,15 +679,14 @@ CALCULATION_TYPES = {
     "jinja": JinjaCalculation,
     "variable": VariableCalculation,
     "information": InformationCalculation,
-    "identifier": IdentifierCalculation,
+    "suffix": SuffixCalculation,
-    "suffix": IdentifierCalculation,
     "index": IndexCalculation,
 }
 CALCULATION_PROPERTY_TYPES = {
     "jinja": JinjaCalculation,
     "variable": VariablePropertyCalculation,
     "information": InformationCalculation,
-    "identifier": IdentifierPropertyCalculation,
+    "suffix": SuffixPropertyCalculation,
     "index": IndexCalculation,
 }
 BASETYPE_CALC = Union[StrictBool, StrictInt, StrictFloat, StrictStr, Calculation, None]
@@ -737,7 +729,7 @@ class Variable(BaseModel):
     help: Optional[str] = None
     hidden: Union[bool, Calculation] = False
     disabled: Union[bool, Calculation] = False
-    mandatory: Union[None, bool, Calculation] = None
+    mandatory: Union[None, bool, Calculation] = True
     empty: Union[None, bool, Calculation] = True
     auto_save: bool = False
     mode: Optional[str] = None

src/rougail/providersupplier.py

@@ -0,0 +1,41 @@
+"""Provider/supplier
+
+distribued with GPL-2 or later license
+
+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 2 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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+"""
+# from rougail.objspace import get_variables
+# from rougail.utils import normalize_family
+#
+#
+# def provider_supplier(objectspace,
+#                      path_prefix,
+#                      ):
+#    n_path_prefix = normalize_family(path_prefix)
+#    for variable in get_variables(objectspace):
+#        if variable.path_prefix != n_path_prefix:
+#            continue
+#        if hasattr(variable, 'provider'):
+#            family_name, variable.name = variable.path.rsplit('.', 1)
+#            objectspace.paths.set_provider(variable,
+#                                           variable.name,
+#                                           family_name,
+#                                           )
+#        if hasattr(variable, 'supplier'):
+#            family_name, variable.name = variable.path.rsplit('.', 1)
+#            objectspace.paths.set_supplier(variable,
+#                                           variable.name,
+#                                           family_name,
+#                                           )

src/rougail/structural_commandline/annotator.py

@@ -3,28 +3,28 @@
 Silique (https://www.silique.fr)
 Copyright (C) 2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from rougail.annotator.variable import Walk
 from rougail.utils import _
 from rougail.error import DictConsistencyError
 
-
 class Annotator(Walk):
     """Annotate value"""
-
     level = 80
 
     def __init__(self, objectspace, *args) -> None:
@@ -37,9 +37,9 @@ class Annotator(Walk):
             if family.commandline:
                 continue
             self.not_for_commandline(family)
-            not_for_commandlines.append(family.path + ".")
+            not_for_commandlines.append(family.path + '.')
         for variable in self.get_variables():
-            if variable.type == "symlink":
+            if variable.type == 'symlink':
                 continue
             variable_path = variable.path
             for family_path in not_for_commandlines:
@@ -53,60 +53,37 @@ class Annotator(Walk):
                     self.manage_negative_description(variable)
 
     def not_for_commandline(self, variable) -> None:
-        self.objectspace.properties.add(variable.path, "not_for_commandline", True)
+        self.objectspace.properties.add(variable.path, 'not_for_commandline', True)
 
     def manage_alternative_name(self, variable) -> None:
         if not variable.alternative_name:
             return
         alternative_name = variable.alternative_name
         variable_path = variable.path
-        all_letters = ""
+        all_letters = ''
         for letter in alternative_name:
             all_letters += letter
-            if all_letters == "h":
+            if all_letters == 'h':
-                msg = _('alternative_name "{0}" conflict with "--help"').format(
+                msg = _(f'alternative_name "{alternative_name}" conflict with "--help"')
-                    alternative_name
-                )
                 raise DictConsistencyError(msg, 202, variable.xmlfiles)
             if all_letters in self.alternative_names:
-                msg = _('conflict alternative_name "{0}": "{1}" and "{2}"').format(
+                msg = _(f'conflict alternative_name "{alternative_name}": "{variable_path}" and "{self.alternative_names[all_letters]}"')
-                    alternative_name, variable_path, self.alternative_names[all_letters]
-                )
                 raise DictConsistencyError(msg, 202, variable.xmlfiles)
 
         self.alternative_names[alternative_name] = variable_path
-        if "." not in variable_path:
+        if '.' not in variable_path:
             path = alternative_name
         else:
-            path = variable_path.rsplit(".", 1)[0] + "." + alternative_name
+            path = variable_path.rsplit('.', 1)[0] + '.' + alternative_name
-        self.objectspace.add_variable(
+        self.objectspace.add_variable(alternative_name, {'type': 'symlink', 'path': path, 'opt': variable}, variable.xmlfiles, False, False, variable.version)
-            alternative_name,
-            {"type": "symlink", "path": path, "opt": variable},
-            variable.xmlfiles,
-            False,
-            False,
-            variable.version,
-        )
 
     def manage_negative_description(self, variable) -> None:
         if not variable.negative_description:
-            if variable.type == "boolean" and not self.objectspace.add_extra_options:
+            if variable.type == 'boolean' and not self.objectspace.add_extra_options:
-                raise DictConsistencyError(
+                raise DictConsistencyError(_(f'negative_description is mandatory for boolean variable, but "{variable.path}" hasn\'t'), 200, variable.xmlfiles)
-                    _(
-                        'negative_description is mandatory for boolean variable, but "{0}" hasn\'t'
-                    ).format(variable.path),
-                    200,
-                    variable.xmlfiles,
-                )
             return
-        if variable.type != "boolean":
+        if variable.type != 'boolean':
-            raise DictConsistencyError(
+            raise DictConsistencyError(_(f'negative_description is only available for boolean variable, but "{variable.path}" is "{variable.type}"'), 201, variable.xmlfiles)
-                _(
-                    'negative_description is only available for boolean variable, but "{0}" is "{1}"'
-                ).format(variable.path, variable.type),
-                201,
-                variable.xmlfiles,
-            )
         self.objectspace.informations.add(
             variable.path, "negative_description", variable.negative_description
         )

src/rougail/structural_commandline/config.py

@@ -4,25 +4,25 @@ Config file for Rougail-structural_commandline
 Silique (https://www.silique.fr)
 Copyright (C) 2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
+def get_rougail_config(*,
-
+                       backward_compatibility=True,
-def get_rougail_config(
+                       ) -> dict:
-    *,
-    backward_compatibility=True,
-) -> dict:
     options = """
 structural_commandline:
   description: Configuration rougail-structural_commandline
@@ -31,12 +31,12 @@ structural_commandline:
     description: Add extra options to tiramisu-cmdline-parser
     default: true
 """
-    return {
+    return {'name': 'exporter',
-        "name": "exporter",
+            'process': 'structural',
-        "process": "structural",
+            'options': options,
-        "options": options,
+            'level': 20,
-        "level": 20,
+            }
-    }
 
 
-__all__ = "get_rougail_config"
+__all__ = ('get_rougail_config')
+

src/rougail/structural_commandline/object_model.py

@@ -3,32 +3,34 @@
 Silique (https://www.silique.fr)
 Copyright (C) 2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from typing import Optional
 from pydantic import BaseModel
 
 
 class Variable(BaseModel):
-    alternative_name: Optional[str] = None
+    alternative_name: Optional[str]=None
-    commandline: bool = True
+    commandline: bool=True
-    negative_description: Optional[str] = None
+    negative_description: Optional[str]=None
 
 
 class Family(BaseModel):
-    commandline: bool = True
+    commandline: bool=True
 
 
-__all__ = ("Variable", "Family")
+__all__ = ('Variable', 'Family')

src/rougail/tiramisu.py

@@ -11,37 +11,33 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
-from typing import Any
-
 try:
     from tiramisu5 import DynOptionDescription, calc_value
 except ModuleNotFoundError:
     from tiramisu import DynOptionDescription, calc_value
 from importlib.machinery import SourceFileLoader as _SourceFileLoader
-from importlib.util import (
+from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec
-    spec_from_loader as _spec_from_loader,
-    module_from_spec as _module_from_spec,
-)
 from jinja2 import StrictUndefined, DictLoader
 from jinja2.sandbox import SandboxedEnvironment
 from rougail.object_model import CONVERT_OPTION
 from rougail.error import display_xmlfiles
-from tiramisu import function_waiting_for_error
+from tiramisu.error import ValueWarning, ConfigError
-from tiramisu.error import ValueWarning, ConfigError, PropertiesOptionError
 from .utils import normalize_family
 
 
@@ -49,55 +45,17 @@ global func
 dict_env = {}
 ENV = SandboxedEnvironment(loader=DictLoader(dict_env), undefined=StrictUndefined)
 func = ENV.filters
-ENV.compile_templates("jinja_caches", zip=None)
+ENV.compile_templates('jinja_caches', zip=None)
-
-
-class JinjaError:
-    __slot__ = ("_err",)
-
-    def __init__(self, err):
-        self._err = err
-
-    def __str__(self):
-        raise self._err from self._err
-
-    def __repr__(self):
-        raise self._err from self._err
-
-    def __eq__(self, *args, **kwargs):
-        raise self._err from self._err
-
-    def __ge__(self, *args, **kwargs):
-        raise self._err from self._err
-
-    def __gt__(self, *args, **kwargs):
-        raise self._err from self._err
-
-    def __le__(self, *args, **kwargs):
-        raise self._err from self._err
-
-    def __lt__(self, *args, **kwargs):
-        raise self._err from self._err
-
-    def __ne__(self, *args, **kwargs):
-        raise self._err from self._err
-
-
-def test_propertyerror(value: Any) -> bool:
-    return isinstance(value, JinjaError)
-
-
-ENV.tests["propertyerror"] = test_propertyerror
 
 
 def load_functions(path):
     global _SourceFileLoader, _spec_from_loader, _module_from_spec, func
-    loader = _SourceFileLoader("func", path)
+    loader = _SourceFileLoader('func', path)
     spec = _spec_from_loader(loader.name, loader)
     func_ = _module_from_spec(spec)
     loader.exec_module(func_)
     for function in dir(func_):
-        if function.startswith("_"):
+        if function.startswith('_'):
             continue
         func[function] = getattr(func_, function)
 
@@ -109,61 +67,41 @@ def rougail_calc_value(*args, __default_value=None, **kwargs):
     return values
 
 
-@function_waiting_for_error
+def jinja_to_function(__internal_variable, __internal_attribute, __internal_jinja, __internal_type, __internal_multi, __internal_files, __default_value=None, **kwargs):
-def jinja_to_function(
-    __internal_variable,
-    __internal_attribute,
-    __internal_jinja,
-    __internal_type,
-    __internal_multi,
-    __internal_files,
-    __default_value=None,
-    **kwargs,
-):
     global ENV, CONVERT_OPTION
     kw = {}
     for key, value in kwargs.items():
-        if isinstance(value, PropertiesOptionError):
+        if '.' in key:
-            value = JinjaError(value)
-        if "." in key:
             c_kw = kw
-            path, var = key.rsplit(".", 1)
+            path, var = key.rsplit('.', 1)
-            for subkey in path.split("."):
+            for subkey in path.split('.'):
                 c_kw = c_kw.setdefault(subkey, {})
             c_kw[var] = value
         else:
             if key in kw:
-                raise ConfigError(
+                raise ConfigError(f'internal error, multi key for "{key}" in jinja_to_function')
-                    f'internal error, multi key for "{key}" in jinja_to_function'
-                )
             kw[key] = value
     try:
         values = ENV.get_template(__internal_jinja).render(kw, **func).strip()
     except Exception as err:
-        raise ConfigError(
+        raise ConfigError(f'cannot calculating "{__internal_attribute}" attribute for variable "{__internal_variable}" in {display_xmlfiles(__internal_files)}: {err}') from err
-            f'cannot calculating "{__internal_attribute}" attribute for variable "{__internal_variable}" in {display_xmlfiles(__internal_files)}: {err}'
+    convert = CONVERT_OPTION[__internal_type].get('func', str)
-        ) from err
-    convert = CONVERT_OPTION[__internal_type].get("func", str)
     if __internal_multi:
-        values = [convert(val) for val in values.split("\n") if val != ""]
+        values = [convert(val) for val in values.split('\n') if val != ""]
         if not values and __default_value is not None:
             return __default_value
         return values
     try:
         values = convert(values)
     except Exception as err:
-        raise ConfigError(
+        raise ConfigError(f'cannot converting "{__internal_attribute}" attribute for variable "{__internal_variable}" in {display_xmlfiles(__internal_files)}: {err}') from err
-            f'cannot converting "{__internal_attribute}" attribute for variable "{__internal_variable}" in {display_xmlfiles(__internal_files)}: {err}'
+    values = values if values != '' and values != 'None' else None
-        ) from err
-    values = values if values != "" and values != "None" else None
     if values is None and __default_value is not None:
         return __default_value
     return values
 
 
 def variable_to_property(prop, value, when, inverse):
-    if isinstance(value, PropertiesOptionError):
-        raise value from value
     if inverse:
         is_match = value != when
     else:
@@ -171,71 +109,64 @@ def variable_to_property(prop, value, when, inverse):
     return prop if is_match else None
 
 
-@function_waiting_for_error
 def jinja_to_property(prop, when, inverse, **kwargs):
-    value = func["jinja_to_function"](**kwargs)
+    value = func['jinja_to_function'](**kwargs)
-    return func["variable_to_property"](prop, value is not None, when, inverse)
+    return func['variable_to_property'](prop, value is not None, when, inverse)
 
 
-@function_waiting_for_error
 def jinja_to_property_help(prop, **kwargs):
-    value = func["jinja_to_function"](**kwargs)
+    value = func['jinja_to_function'](**kwargs)
-    return (prop, f'"{prop}" ({value})')
+    return (prop, f'\"{prop}\" ({value})')
 
 
-@function_waiting_for_error
 def valid_with_jinja(warnings_only=False, **kwargs):
     global ValueWarning
-    value = func["jinja_to_function"](**kwargs)
+    value = func['jinja_to_function'](**kwargs)
     if value:
-        if warnings_only:
+       if warnings_only:
-            raise ValueWarning(value)
+           raise ValueWarning(value)
-        else:
+       else:
-            raise ValueError(value)
+           raise ValueError(value)
 
 
-func["calc_value"] = rougail_calc_value
+func['calc_value'] = rougail_calc_value
-func["jinja_to_function"] = jinja_to_function
+func['jinja_to_function'] = jinja_to_function
-func["jinja_to_property"] = jinja_to_property
+func['jinja_to_property'] = jinja_to_property
-func["jinja_to_property_help"] = jinja_to_property_help
+func['jinja_to_property_help'] = jinja_to_property_help
-func["variable_to_property"] = variable_to_property
+func['variable_to_property'] = variable_to_property
-func["valid_with_jinja"] = valid_with_jinja
+func['valid_with_jinja'] = valid_with_jinja
 
 
 class ConvertDynOptionDescription(DynOptionDescription):
-    """Identifier could be an integer, we should convert it in str
+    """Suffix could be an integer, we should convert it in str
-    Identifier could also contain invalid character, so we should "normalize" it
+    Suffix could also contain invalid character, so we should "normalize" it
     """
 
-    def convert_identifier_to_path(self, identifier):
+    def convert_suffix_to_path(self, suffix):
-        if identifier is None:
+        if suffix is None:
-            return identifier
+            return suffix
-        if not isinstance(identifier, str):
+        if not isinstance(suffix, str):
-            identifier = str(identifier)
+            suffix = str(suffix)
-        return normalize_family(identifier)
+        return normalize_family(suffix)
 
     def impl_getname(
         self,
-        identifier=None,
+        suffix=None,
     ) -> str:
         """get name"""
         name = super().impl_getname(None)
-        if identifier is None:
+        if suffix is None:
             return name
-        path_identifier = self.convert_identifier_to_path(identifier)
+        path_suffix = self.convert_suffix_to_path(suffix)
-        if "{{ identifier }}" in name:
+        if "{{ suffix }}" in name:
-            return name.replace("{{ identifier }}", path_identifier)
+            return name.replace("{{ suffix }}", path_suffix)
-        return name + path_identifier
+        return name + path_suffix
 
     def impl_get_display_name(
         self,
         subconfig,
-        with_quote: bool = False,
+        ) -> str:
-    ) -> str:
+        display = super().impl_get_display_name(subconfig)
-        display = super().impl_get_display_name(subconfig, with_quote=with_quote)
+        if "{{ suffix }}" in display:
-        if "{{ identifier }}" in display:
+            return display.replace("{{ suffix }}", self.convert_suffix_to_path(self.get_suffixes(subconfig)[-1]))
-            return display.replace(
-                "{{ identifier }}",
-                self.convert_identifier_to_path(self.get_identifiers(subconfig)[-1]),
-            )
         return display

src/rougail/tiramisureflector.py

@@ -12,20 +12,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from typing import Optional, Union
 from json import dumps
 from os.path import isfile, basename
@@ -87,15 +89,6 @@ class TiramisuReflector:
                     continue
                 self.text["header"].append(f"load_functions('{funcs_path}')")
         if self.objectspace.export_with_import:
-            if objectspace.main_namespace:
-                self.text["header"].extend(
-                    [
-                        "try:",
-                        "    groups.namespace",
-                        "except:",
-                        "    groups.addgroup('namespace')",
-                    ]
-                )
             for mode in self.objectspace.modes_level:
                 self.text["header"].append(f'ALLOWED_LEADER_PROPERTIES.add("{mode}")')
         self.make_tiramisu_objects()
@@ -113,9 +106,9 @@ class TiramisuReflector:
     def make_tiramisu_objects(self) -> None:
         """make tiramisu objects"""
         baseelt = BaseElt()
-        self.objectspace.reflector_names[baseelt.path] = (
+        self.objectspace.reflector_names[
-            f"option_0{self.objectspace.suffix}"
+            baseelt.path
-        )
+        ] = f"option_0{self.objectspace.suffix}"
         basefamily = Family(
             baseelt,
             self,
@@ -329,19 +322,19 @@ class Common:
                     information_variable.informations.append(information_name)
                     return information_name
             return f'ParamInformation("{param["information"]}", {default})'
-        if param["type"] == "identifier":
+        if param["type"] == "suffix":
-            if "identifier" in param and param["identifier"] != None:
+            if "suffix" in param and param["suffix"] != None:
-                return f"ParamIdentifier(identifier_index={param['identifier']})"
+                return f"ParamSuffix(suffix_index={param['suffix']})"
-            return "ParamIdentifier()"
+            return "ParamSuffix()"
         if param["type"] == "index":
             return "ParamIndex()"
         if param["type"] == "variable":
             return self.build_option_param(
                 param["variable"],
                 param.get("propertyerror", True),
-                param.get("identifier"),
+                param.get("suffix"),
                 param.get("dynamic"),
-                param.get("whole", False),
+                param.get('whole', False),
             )
         if param["type"] == "any":
             if isinstance(param["value"], str):
@@ -355,7 +348,7 @@ class Common:
         self,
         variable,
         propertyerror,
-        identifier: Optional[str],
+        suffix: Optional[str],
         dynamic,
         whole: bool,
     ) -> str:
@@ -369,14 +362,9 @@ class Common:
             self.calls, self.elt.path
         )
         params = [f"{option_name}"]
-        if identifier is not None:
+        if suffix is not None:
             param_type = "ParamDynOption"
-            identifiers = []
+            params.append(self.convert_str(suffix))
-            for ident in identifier:
-                if isinstance(ident, str):
-                    ident = self.convert_str(ident)
-                identifiers.append(str(ident))
-            params.append("[" + ", ".join(identifiers) + "]")
         else:
             param_type = "ParamOption"
         if not propertyerror:
@@ -407,6 +395,7 @@ class Common:
             ret += ", kwargs={" + ", ".join(kwargs) + "}"
         ret += ")"
         if hasattr(child, "warnings_only"):
+            print("HU????")
             ret += f", warnings_only={child.warnings_only}"
         if "help" in child:
             ret += f", help_function=func['{child['help']}']"
@@ -476,15 +465,13 @@ class Variable(Common):
             keys["values"] = self.populate_calculation(
                 self.elt.choices, return_a_tuple=True
             )
-        if self.elt.type == "regexp":
+        if self.elt.type == 'regexp':
-            self.object_type = "Regexp_" + self.option_name
+            self.object_type = 'Regexp_' + self.option_name
-            self.tiramisu.text["header"].append(
+            self.tiramisu.text['header'].append(f'''class {self.object_type}(RegexpOption):
-                f"""class {self.object_type}(RegexpOption):
     __slots__ = tuple()
     _type = 'value'
 {self.object_type}._regexp = re_compile(r"{self.elt.regexp}")
-"""
+''')
-            )
         if self.elt.path in self.objectspace.multis:
             keys["multi"] = self.objectspace.multis[self.elt.path]
         if hasattr(self.elt, "default") and self.elt.default is not None:
@@ -531,10 +518,6 @@ class Family(Common):
             self.object_type = "Leadership"
         else:
             self.object_type = "OptionDescription"
-        if hasattr(self.elt, "name") and self.elt.name == self.elt.namespace:
-            self.group_type = "groups.namespace"
-        else:
-            self.group_type = None
         self.children = []
 
     def add(self, child):
@@ -545,10 +528,8 @@ class Family(Common):
         self,
         keys: list,
     ) -> None:
-        if self.group_type:
-            keys["group_type"] = self.group_type
         if self.elt.type == "dynamic":
-            keys["identifiers"] = self.populate_calculation(self.elt.dynamic)
+            keys["suffixes"] = self.populate_calculation(self.elt.dynamic)
         children = []
         for path in self.objectspace.parents[self.elt.path]:
             children.append(self.objectspace.paths[path])

src/rougail/update/__init__.py

@@ -2,18 +2,20 @@
 Silique (https://www.silique.fr)
 Copyright (C) 2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from .update import RougailUpgrade

src/rougail/update/update.py

@@ -6,18 +6,21 @@ Copyright (C) 2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
 
 from os import listdir
@@ -60,7 +63,7 @@ class upgrade_010_to_10:
         xmlsrc: str,
     ) -> None:
         self.xmlsrc = xmlsrc
-        self.paths = {"family": {}, "variable": {}, "dynamic": {}}
+        self.paths = {"family": {}, "variable": {}, 'dynamic': {}}
         self.lists = {
             "service": {},
             "ip": {},
@@ -79,26 +82,18 @@ class upgrade_010_to_10:
         sub_path: str,
         true_sub_path: str,
         *,
-        root: bool = False,
+        root: bool=False,
-        is_dynamic: bool = False,
+        is_dynamic: bool=False,
     ) -> dict:
         new_families = {}
         if root:
-            new_families["version"] = None
+            new_families['version'] = None
         if "variables" in family:
             for subelt in family["variables"]:
                 for typ, obj in subelt.items():
                     for subobj in obj:
-                        local_is_dynamic = (
+                        local_is_dynamic = is_dynamic or subobj.get('dynamic') is not None
-                            is_dynamic or subobj.get("dynamic") is not None
+                        getattr(self, f"convert_{typ}")(subobj, new_families, sub_path, true_sub_path, local_is_dynamic)
-                        )
-                        getattr(self, f"convert_{typ}")(
-                            subobj,
-                            new_families,
-                            sub_path,
-                            true_sub_path,
-                            local_is_dynamic,
-                        )
             family.pop("variables")
         return new_families
 
@@ -117,7 +112,7 @@ class upgrade_010_to_10:
         else:
             true_sub_path = name
         if is_dynamic:
-            name += "{{ suffix }}"
+            name += '{{ suffix }}'
         if sub_path:
             sub_path = sub_path + "." + name
         else:
@@ -131,9 +126,7 @@ class upgrade_010_to_10:
                 if typ == "dynamic":
                     family["variable"] = self.get_variable_path(value)
         # add sub families and sub variables
-        sub_families = self.parse_variables(
+        sub_families = self.parse_variables(family, sub_path, true_sub_path, is_dynamic=is_dynamic)
-            family, sub_path, true_sub_path, is_dynamic=is_dynamic
-        )
         for sub_name, sub_family in sub_families.copy().items():
             if sub_name not in family:
                 continue
@@ -159,13 +152,13 @@ class upgrade_010_to_10:
             else:
                 true_sub_path = name
             self.flatten_paths["variable"][name] = true_sub_path
-            name += "{{ suffix }}"
+            name += '{{ suffix }}'
         if sub_path:
             sub_path = sub_path + "." + name
         else:
             sub_path = name
         if is_dynamic:
-            self.paths["dynamic"][true_sub_path] = sub_path
+            self.paths['dynamic'][true_sub_path] = sub_path
         new_families[name] = variable
         self.flatten_paths["variable"][name] = sub_path
         self.paths["variable"][sub_path] = variable
@@ -205,18 +198,17 @@ class upgrade_010_to_10:
                         )(test)
                     )
             variable["test"] = tests
-        if variable.get("mandatory", False):
+        if variable.get('mandatory', False):
             del variable["mandatory"]
-        CONVERT_TYPE = {
+        CONVERT_TYPE = {'filename': 'unix_filename',
-            "filename": "unix_filename",
+                        'password': 'secret',
-            "password": "secret",
+                        }
-        }
+        if variable.get('type') in CONVERT_TYPE:
-        if variable.get("type") in CONVERT_TYPE:
+            variable['type'] = CONVERT_TYPE[variable['type']]
-            variable["type"] = CONVERT_TYPE[variable["type"]]
 
     def parse_variables_with_path(self):
         for variable in self.paths["variable"].values():
-            multi = variable.get("multi", False)
+            multi = variable.get('multi', False)
             if "value" in variable:
                 default = variable.pop("value")
                 if default is not None:
@@ -231,8 +223,7 @@ class upgrade_010_to_10:
                     variable["choices"] = variable.pop("choice")
                 else:
                     variable["choices"] = [
-                        self.get_value(choice, multi)
+                        self.get_value(choice, multi) for choice in variable.pop("choice")
-                        for choice in variable.pop("choice")
                     ]
 
     def parse_services(
@@ -359,21 +350,21 @@ class upgrade_010_to_10:
                 if variable_path is None:
                     continue
                 variable = self.paths["variable"][variable_path]
-                if variable.get("multi", False):
+                if variable.get('multi', False):
                     multi = True
         if apply_on_fallback:
             condition_value = True
         else:
             if "{{ suffix }}" in source:
-                force_param = {"__var": source}
+                force_param = {'__var': source}
-                source = "__var"
+                source = '__var'
             else:
                 force_param = None
             condition_value = self.params_condition_to_jinja(
                 prop, source, condition["param"], name.endswith("if_in"), multi
             )
             if force_param:
-                condition_value.setdefault("params", {}).update(force_param)
+                condition_value.setdefault('params', {}).update(force_param)
         for target in condition["target"]:
             typ = target.get("type", "variable")
             if typ == "variable":
@@ -426,9 +417,7 @@ class upgrade_010_to_10:
                 check["param"] = [
                     {"text": variable_path, "type": "variable"}
                 ] + check.get("param", [])
-                check_value = self.convert_param_function(
+                check_value = self.convert_param_function(check, variable.get('multi', False))
-                    check, variable.get("multi", False)
-                )
             variable.setdefault("validators", []).append(check_value)
 
     def parse_fill(
@@ -448,16 +437,12 @@ class upgrade_010_to_10:
                         "jinja": fill["name"],
                     }
                 else:
-                    fill_value = self.convert_param_function(
+                    fill_value = self.convert_param_function(fill, variable.get('multi', False))
-                        fill, variable.get("multi", False)
-                    )
                 variable["default"] = fill_value
-                if variable.get("mandatory") is False:
+                if variable.get('mandatory') is False:
-                    del variable["mandatory"]
+                    del variable['mandatory']
             else:
-                raise Exception(
+                raise Exception(f'cannot set fill to unknown variable "{variable_path}"')
-                    f'cannot set fill to unknown variable "{variable_path}"'
-                )
 
     def params_condition_to_jinja(
         self,
@@ -553,8 +538,8 @@ class upgrade_010_to_10:
                 new_param = {attr_name: value}
                 value = attr_name
             elif typ in ["index", "suffix"]:
-                if "name" in value:
+                if 'name' in value:
-                    attr_name = value["name"]
+                    attr_name = value['name']
                 else:
                     attr_name = f"__{typ}"
                 new_param = {attr_name: {"type": typ}}
@@ -565,7 +550,7 @@ class upgrade_010_to_10:
                 value = value[typ]
             elif "{{ suffix }}" in value[typ]:
                 path = value[typ]
-                attr_name = path.split(".")[-1][:-12]  # remove {{ suffix }}
+                attr_name = path.split('.')[-1][:-12]  # remove {{ suffix }}
                 new_param = {attr_name: value}
                 value = attr_name
             else:
@@ -583,22 +568,16 @@ class upgrade_010_to_10:
     ) -> str:
         text = param["name"]
         params = {}
-        #        multi = False
+#        multi = False
         if "param" in param and param["param"]:
-            if (
+            if text == 'calc_value' and len(param["param"]) == 1 and isinstance(param["param"][0], dict) and param["param"][0].get('type') == 'variable' and param["param"][0].get("text"):
-                text == "calc_value"
-                and len(param["param"]) == 1
-                and isinstance(param["param"][0], dict)
-                and param["param"][0].get("type") == "variable"
-                and param["param"][0].get("text")
-            ):
                 value = param["param"][0]["text"]
                 path = self.get_variable_path(value)
                 if not path:
                     path = value
                 ret = {"type": "variable", "variable": path}
-                if "optional" in param["param"][0]:
+                if 'optional' in param["param"][0]:
-                    ret["optional"] = param["param"][0]["optional"]
+                    ret['optional'] = param["param"][0]["optional"]
                 return ret
             first, *others = param["param"]
             new_param, first = self.get_jinja_param_and_value(first, multi)
@@ -625,13 +604,9 @@ class upgrade_010_to_10:
         if not multi:
             text = "{{ " + text + " }}"
         else:
-            text = (
+            text = """{% for __variable in """ + text + """ %}
-                """{% for __variable in """
-                + text
-                + """ %}
 {{ __variable }}
 {% endfor %}"""
-            )
         ret = {"type": "jinja", "jinja": text}
         if params:
             ret["params"] = params
@@ -684,21 +659,16 @@ class RougailUpgrade:
     def run(
         self,
     ):
-        for dict_dir, dest_dir in zip(
+        for dict_dir, dest_dir in zip(self.rougailconfig["main_dictionaries"], self.rougailconfig["upgrade_options.main_dictionaries"]):
-            self.rougailconfig["main_dictionaries"],
-            self.rougailconfig["upgrade_options.main_dictionaries"],
-        ):
             self._load_dictionaries(
                 dict_dir,
                 dest_dir,
                 normalize_family(self.rougailconfig["main_namespace"]),
             )
-        if self.rougailconfig["main_namespace"]:
+        if self.rougailconfig['main_namespace']:
             if self.rougailconfig["extra_dictionaries"]:
                 dst_extra_dir = self.rougailconfig["upgrade_options.extra_dictionary"]
-                for namespace, extra_dirs in self.rougailconfig[
+                for namespace, extra_dirs in self.rougailconfig["extra_dictionaries"].items():
-                    "extra_dictionaries"
-                ].items():
                     extra_dstsubfolder = Path(dst_extra_dir) / namespace
                     if not extra_dstsubfolder.is_dir():
                         extra_dstsubfolder.mkdir()
@@ -707,7 +677,7 @@ class RougailUpgrade:
                             str(extra_dir),
                             str(extra_dstsubfolder),
                             normalize_family(namespace),
-                        )
+                    )
 
     def _load_dictionaries(
         self,
@@ -727,7 +697,7 @@ class RougailUpgrade:
         for filename in filenames:
             xmlsrc = Path(srcfolder) / Path(filename)
 
-            ymldst = Path(dstfolder) / (Path(filename).stem + ".yml")
+            ymldst = Path(dstfolder) / (Path(filename).stem + '.yml')
             if filename.endswith(".xml"):
                 if parse is None:
                     raise Exception("XML module is not installed")
@@ -735,7 +705,7 @@ class RougailUpgrade:
                     parser = XMLParser(remove_blank_text=True)
                     document = parse(xmlsrc, parser)
                 except XMLSyntaxError as err:
-                    raise Exception(_("not a XML file: {0}").format(err)) from err
+                    raise Exception(_(f"not a XML file: {err}")) from err
                 root = document.getroot()
                 search_function_name = get_function_name(
                     root.attrib.get("version", "1")
@@ -762,7 +732,7 @@ class RougailUpgrade:
                         root_services = root_services_
                 if function_version == search_function_name:
                     function_found = True
-            if root != {"version": None}:
+            if root != {'version': None}:
                 root["version"] = float(version)
                 with ymldst.open("w") as ymlfh:
                     yaml = YAML()
@@ -953,26 +923,25 @@ class RougailUpgrade:
                     "variable": value.pop("variable"),
                     "propertyerror": False,
                 }
-                if "{{ suffix }}" not in key:
+                if '{{ suffix }}' not in key:
-                    new_root[key + "{{ suffix }}"] = new_root.pop(key)
+                    new_root[key + '{{ suffix }}'] = new_root.pop(key)
                     update_root = True
             self._update_1_1(value)
-            for typ, obj in {
+            for typ, obj in {'boolean': bool,
-                "boolean": bool,
+                             'number': int,
-                "number": int,
+                             'string': str,
-                "string": str,
+                             'float': float,
-                "float": float,
+                             }.items():
-            }.items():
+                if value.get('type') == typ:
-                if value.get("type") == typ:
+                    default = value.get('default')
-                    default = value.get("default")
                     if default is None or default == []:
                         continue
                     if isinstance(default, obj):
-                        del value["type"]
+                        del value['type']
                     elif isinstance(default, list) and isinstance(default[0], obj):
-                        del value["type"]
+                        del value['type']
-            if value.get("multi") and isinstance(value.get("default"), list):
+            if value.get('multi') and isinstance(value.get('default'), list):
-                del value["multi"]
+                del value['multi']
         if update_root:
             root.clear()
             root.update(new_root)

src/rougail/utils.py

@@ -11,20 +11,22 @@ Copyright (C) 2019-2021
 Silique (https://www.silique.fr)
 Copyright (C) 2022-2024
 
-This program is free software: you can redistribute it and/or modify it
+distribued with GPL-2 or later license
-under the terms of the GNU Lesser 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
+This program is free software; you can redistribute it and/or modify
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+it under the terms of the GNU General Public License as published by
-FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+the Free Software Foundation; either version 2 of the License, or
-details.
+(at your option) any later version.
 
-You should have received a copy of the GNU Lesser General Public License
+This program is distributed in the hope that it will be useful,
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+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, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """
-
 from typing import List, Union
 from unicodedata import normalize, combining
 import re
@@ -53,8 +55,9 @@ def valid_variable_family_name(
     match = NAME_REGEXP.search(name)
     if not match:
         msg = _(
-            'invalid variable or family name "{0}" must only contains lowercase ascii character, number or _'
+            f'invalid variable or family name "{name}" must only contains '
-        ).format(name)
+            "lowercase ascii character, number or _"
+        )
         raise DictConsistencyError(msg, 76, xmlfiles)
 
 
@@ -114,16 +117,14 @@ def get_jinja_variable_to_param(
         for g in parsed_content.find_all(Getattr):
             variables.add(recurse_getattr(g))
     except TemplateSyntaxError as err:
-        msg = _('error in jinja "{0}" for the variable "{1}": {2}').format(
+        msg = _(f'error in jinja "{jinja_text}" for the variable "{ current_path }": {err}')
-            jinja_text, current_path, err
-        )
         raise DictConsistencyError(msg, 39, xmlfiles) from err
     variables = list(variables)
     variables.sort(reverse=True)
     founded_variables = {}
     unknown_variables = []
     for variable_path in variables:
-        variable, identifier = objectspace.paths.get_with_dynamic(
+        variable, suffix = objectspace.paths.get_with_dynamic(
             variable_path,
             path_prefix,
             current_path,
@@ -132,9 +133,9 @@ def get_jinja_variable_to_param(
             xmlfiles,
         )
         if variable and variable.path in objectspace.variables:
-            founded_variables[variable_path] = (identifier, variable)
+            founded_variables[variable_path] = (suffix, variable)
         else:
-            sub_family = variable_path + "."
+            sub_family = variable_path + '.'
             for founded_variable in chain(founded_variables, unknown_variables):
                 if founded_variable.startswith(sub_family):
                     break
@@ -148,9 +149,9 @@ def get_jinja_variable_to_param(
         else:
             root_path = None
             vpath = variable_path
-            while "." in vpath:
+            while '.' in vpath:
-                vpath = vpath.rsplit(".", 1)[0]
+                vpath = vpath.rsplit('.', 1)[0]
-                variable, identifier = objectspace.paths.get_with_dynamic(
+                variable, suffix = objectspace.paths.get_with_dynamic(
                     vpath,
                     path_prefix,
                     current_path,

tests/dictionaries/00_0empty/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_0empty/tiramisu/multi.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")

tests/dictionaries/00_0version_underscore/tiramisu/base.py

@@ -3,13 +3,9 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = StrOption(name="version", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_0version_underscore/tiramisu/multi.py

@@ -3,17 +3,13 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = StrOption(name="version", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_6 = StrOption(name="version", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"basic"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"basic"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_1empty_variable/tiramisu/base.py

@@ -3,13 +3,9 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = StrOption(name="empty", doc="empty", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_1empty_variable/tiramisu/multi.py

@@ -3,17 +3,13 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = StrOption(name="empty", doc="empty", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_6 = StrOption(name="empty", doc="empty", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"basic"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"basic"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_2default_calculated/tiramisu/base.py

@@ -3,15 +3,11 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_rougail.var2'] = "{{ _.var1 }}\n"
 option_2 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_2default_calculated/tiramisu/multi.py

@@ -3,21 +3,17 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_1.rougail.var2'] = "{{ _.var1 }}\n"
 dict_env['default_2.rougail.var2'] = "{{ _.var1 }}\n"
 option_3 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_7 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_7, option_8], properties=frozenset({"standard"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"}))
 optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5])

tests/dictionaries/00_2default_calculated/tiramisu/no_namespace.py

@@ -8,5 +8,5 @@ ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_var2'] = "{{ _.var1 }}\n"
 option_1 = StrOption(name="var1", doc="a first variable", default="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2])

tests/dictionaries/00_2default_calculated_multi/tiramisu/base.py

@@ -3,15 +3,11 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
 option_2 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_3 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("rougail.var2"), '_.var1': ParamOption(option_2)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_2default_calculated_multi/tiramisu/multi.py

@@ -3,21 +3,17 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_1.rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
 dict_env['default_2.rougail.var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
 option_3 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_4 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_1.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("1.rougail.var2"), '_.var1': ParamOption(option_3)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_7 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_8 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_2.rougail.var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("2.rougail.var2"), '_.var1': ParamOption(option_7)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_7, option_8], properties=frozenset({"standard"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"}))
 optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5])

tests/dictionaries/00_2default_calculated_multi/tiramisu/no_namespace.py

@@ -8,5 +8,5 @@ ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['default_var2'] = "{% for val in _.var1 %}\n{{ val }}\n{% endfor %}\n"
 option_1 = StrOption(name="var1", doc="a first variable", multi=True, default=["no", "yes", "maybe"], default_multi="no", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1, notraisepropertyerror=True)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
+option_2 = StrOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("default_var2"), '__internal_type': ParamValue("string"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_2default_calculated_multi/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("default"), '__internal_variable': ParamValue("var2"), '_.var1': ParamOption(option_1)})), properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_2])

tests/dictionaries/00_2default_calculated_variable_transitive/dictionaries/rougail/00-base.yml

@@ -1,13 +1,11 @@
 ---
 version: 1.1
-
 var1:
   description: a first variable
   multi: true
   type: domainname
   params:
     allow_ip: true
-
 var2:
   description: a second variable
   default:

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/base.py

@@ -3,14 +3,10 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
 option_3 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_2)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_2default_calculated_variable_transitive/tiramisu/multi.py

@@ -3,19 +3,15 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
 option_4 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_3)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_7 = DomainnameOption(name="var1", doc="a first variable", multi=True, type="domainname", allow_ip=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'domainname'})
 option_8 = DomainnameOption(name="var2", doc="a second variable", multi=True, default=Calculation(func['calc_value'], Params((ParamOption(option_7)))), type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_7, option_8], properties=frozenset({"basic"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"}))
 optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5])

tests/dictionaries/00_4load_subfolder/tiramisu/base.py

@@ -3,14 +3,10 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
 option_3 = StrOption(name="var2", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_4load_subfolder/tiramisu/multi.py

@@ -3,19 +3,15 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
 option_4 = StrOption(name="var2", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_7 = StrOption(name="var1", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
 option_8 = StrOption(name="var2", doc="a variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'string'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_7, option_8], properties=frozenset({"basic"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"}))
 optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5])

tests/dictionaries/00_5load_notype/tiramisu/base.py

@@ -3,13 +3,9 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = StrOption(name="without_type", doc="a variable", default="non", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_5load_notype/tiramisu/multi.py

@@ -3,17 +3,13 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = StrOption(name="without_type", doc="a variable", default="non", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_6 = StrOption(name="without_type", doc="a variable", default="non", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6boolean/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,5 +12,5 @@ option_4 = BoolOption(name="var3", doc="the third variable", default=True, prope
 option_5 = BoolOption(name="var4", doc="the forth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_6 = BoolOption(name="var5", doc="the fifth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_7 = BoolOption(name="var6", doc="the sixth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6boolean/tiramisu/multi.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,7 +12,7 @@ option_5 = BoolOption(name="var3", doc="the third variable", default=True, prope
 option_6 = BoolOption(name="var4", doc="the forth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_7 = BoolOption(name="var5", doc="the fifth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_8 = BoolOption(name="var6", doc="the sixth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_11 = BoolOption(name="var1", doc="the first variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_12 = BoolOption(name="var2", doc="the second variable", default=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
@@ -24,6 +20,6 @@ option_13 = BoolOption(name="var3", doc="the third variable", default=True, prop
 option_14 = BoolOption(name="var4", doc="the forth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_15 = BoolOption(name="var5", doc="the fifth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
 option_16 = BoolOption(name="var6", doc="the sixth variable", default=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'boolean'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
+optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
 optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6boolean_no_mandatory/tiramisu/base.py

@@ -3,13 +3,9 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = BoolOption(name="variable", doc="a variable", default=True, properties=frozenset({"standard"}), informations={'type': 'boolean'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6boolean_no_mandatory/tiramisu/multi.py

@@ -3,17 +3,13 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = BoolOption(name="variable", doc="a variable", default=True, properties=frozenset({"standard"}), informations={'type': 'boolean'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_6 = BoolOption(name="variable", doc="a variable", default=True, properties=frozenset({"standard"}), informations={'type': 'boolean'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6choice/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,5 +12,5 @@ option_4 = ChoiceOption(name="var3", doc="the third variable", values=("a", "b",
 option_5 = ChoiceOption(name="var4", doc="the forth variable", values=(None, "b", "c"), properties=frozenset({"standard"}), informations={'type': 'choice'})
 option_6 = ChoiceOption(name="var5", doc="the fifth variable", values=("a", "b", "c"), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
 option_7 = ChoiceOption(name="var6", doc="the sixth variable", values=(1, 2, 3), default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6choice/tiramisu/multi.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,7 +12,7 @@ option_5 = ChoiceOption(name="var3", doc="the third variable", values=("a", "b",
 option_6 = ChoiceOption(name="var4", doc="the forth variable", values=(None, "b", "c"), properties=frozenset({"standard"}), informations={'type': 'choice'})
 option_7 = ChoiceOption(name="var5", doc="the fifth variable", values=("a", "b", "c"), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
 option_8 = ChoiceOption(name="var6", doc="the sixth variable", values=(1, 2, 3), default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_11 = ChoiceOption(name="var1", doc="the first variable", values=("a", "b", "c"), properties=frozenset({"basic", "mandatory"}), informations={'type': 'choice'})
 option_12 = ChoiceOption(name="var2", doc="the second variable", values=("a", "b", "c"), properties=frozenset({"basic", "mandatory"}), informations={'type': 'choice'})
@@ -24,6 +20,6 @@ option_13 = ChoiceOption(name="var3", doc="the third variable", values=("a", "b"
 option_14 = ChoiceOption(name="var4", doc="the forth variable", values=(None, "b", "c"), properties=frozenset({"standard"}), informations={'type': 'choice'})
 option_15 = ChoiceOption(name="var5", doc="the fifth variable", values=("a", "b", "c"), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
 option_16 = ChoiceOption(name="var6", doc="the sixth variable", values=(1, 2, 3), default=1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"basic"}))
+optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"basic"}))
 optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6choice_calculation/tiramisu/base.py

@@ -3,14 +3,10 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['choices_rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
 option_2 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6choice_calculation/tiramisu/multi.py

@@ -3,19 +3,15 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 dict_env['choices_1.rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
 dict_env['choices_2.rougail.var'] = "{% for n in trange(0, 10) %}\n{{ n }}\n{% endfor %}\n"
 option_3 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_1.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("1.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_6 = ChoiceOption(name="var", doc="a variable", values=Calculation(func['jinja_to_function'], Params((), kwargs={'__internal_jinja': ParamValue("choices_2.rougail.var"), '__internal_type': ParamValue("number"), '__internal_multi': ParamValue(True), '__internal_files': ParamValue(['tests/dictionaries/00_6choice_calculation/dictionaries/rougail/00-base.yml']), '__internal_attribute': ParamValue("choices"), '__internal_variable': ParamValue("2.rougail.var")})), default=9, properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6choice_variable/tiramisu/base.py

@@ -3,14 +3,10 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = StrOption(name="var1", doc="a second variable", multi=True, default=["a", "b", "c"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_3 = ChoiceOption(name="var2", doc="a first variable", values=Calculation(func['calc_value'], Params((ParamOption(option_2)))), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6choice_variable/tiramisu/multi.py

@@ -3,19 +3,15 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = StrOption(name="var1", doc="a second variable", multi=True, default=["a", "b", "c"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_4 = ChoiceOption(name="var2", doc="a first variable", values=Calculation(func['calc_value'], Params((ParamOption(option_3)))), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_7 = StrOption(name="var1", doc="a second variable", multi=True, default=["a", "b", "c"], default_multi="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_8 = ChoiceOption(name="var2", doc="a first variable", values=Calculation(func['calc_value'], Params((ParamOption(option_7)))), default="a", properties=frozenset({"mandatory", "standard"}), informations={'type': 'choice'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_7, option_8], properties=frozenset({"standard"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"standard"}))
 optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5])

tests/dictionaries/00_6custom/tiramisu/base.py

@@ -3,14 +3,10 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = CustomOption(name="custom1", doc="the first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'custom'})
 option_3 = CustomOption(name="custom2", doc="the seconf variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'custom'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6custom/tiramisu/multi.py

@@ -3,19 +3,15 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = CustomOption(name="custom1", doc="the first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'custom'})
 option_4 = CustomOption(name="custom2", doc="the seconf variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'custom'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_7 = CustomOption(name="custom1", doc="the first variable", properties=frozenset({"basic", "mandatory"}), informations={'type': 'custom'})
 option_8 = CustomOption(name="custom2", doc="the seconf variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'custom'})
-optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_7, option_8], properties=frozenset({"basic"}))
+optiondescription_6 = OptionDescription(name="rougail", doc="Rougail", children=[option_7, option_8], properties=frozenset({"basic"}))
 optiondescription_5 = OptionDescription(name="2", doc="2", children=[optiondescription_6], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_5])

tests/dictionaries/00_6domainname/tiramisu/base.py

@@ -3,13 +3,9 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6domainname/tiramisu/multi.py

@@ -3,17 +3,13 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_6 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=False, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6domainname_params/tiramisu/base.py

@@ -3,13 +3,9 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6domainname_params/tiramisu/multi.py

@@ -3,17 +3,13 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_6 = DomainnameOption(name="variable", doc="a domain name variable", default="my.domain.name", type="domainname", allow_ip=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'domainname'})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6float/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,5 +12,5 @@ option_4 = FloatOption(name="var3", doc="the third variable", default=0.0, prope
 option_5 = FloatOption(name="var4", doc="the forth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_6 = FloatOption(name="var5", doc="the fifth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_7 = FloatOption(name="var6", doc="the sixth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6float/tiramisu/multi.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,7 +12,7 @@ option_5 = FloatOption(name="var3", doc="the third variable", default=0.0, prope
 option_6 = FloatOption(name="var4", doc="the forth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_7 = FloatOption(name="var5", doc="the fifth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_8 = FloatOption(name="var6", doc="the sixth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_11 = FloatOption(name="var1", doc="the first variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_12 = FloatOption(name="var2", doc="the second variable", default=0.0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
@@ -24,6 +20,6 @@ option_13 = FloatOption(name="var3", doc="the third variable", default=0.0, prop
 option_14 = FloatOption(name="var4", doc="the forth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_15 = FloatOption(name="var5", doc="the fifth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
 option_16 = FloatOption(name="var6", doc="the sixth variable", default=10.1, properties=frozenset({"mandatory", "standard"}), informations={'type': 'float'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
+optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
 optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6number/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,5 +12,5 @@ option_4 = IntOption(name="var3", doc="the third variable", default=0, propertie
 option_5 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_6 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_7 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6number/tiramisu/multi.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,7 +12,7 @@ option_5 = IntOption(name="var3", doc="the third variable", default=0, propertie
 option_6 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_7 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_8 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5, option_6, option_7, option_8], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_11 = IntOption(name="var1", doc="the first variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_12 = IntOption(name="var2", doc="the second variable", default=0, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
@@ -24,6 +20,6 @@ option_13 = IntOption(name="var3", doc="the third variable", default=0, properti
 option_14 = IntOption(name="var4", doc="this forth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_15 = IntOption(name="var5", doc="the fifth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
 option_16 = IntOption(name="var6", doc="the sixth variable", default=10, properties=frozenset({"mandatory", "standard"}), informations={'type': 'number'})
-optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
+optiondescription_10 = OptionDescription(name="rougail", doc="Rougail", children=[option_11, option_12, option_13, option_14, option_15, option_16], properties=frozenset({"standard"}))
 optiondescription_9 = OptionDescription(name="2", doc="2", children=[optiondescription_10], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_9])

tests/dictionaries/00_6port/tiramisu/base.py

@@ -3,15 +3,11 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_2 = PortOption(name="variable1", doc="a port variable", allow_private=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'port'})
 option_3 = PortOption(name="variable2", doc="a port variable with default value", default="8080", allow_private=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'port'})
 option_4 = PortOption(name="variable3", doc="a port variable with integer default value", default="8080", allow_private=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'port'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6port/tiramisu/multi.py

@@ -3,21 +3,17 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
 option_3 = PortOption(name="variable1", doc="a port variable", allow_private=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'port'})
 option_4 = PortOption(name="variable2", doc="a port variable with default value", default="8080", allow_private=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'port'})
 option_5 = PortOption(name="variable3", doc="a port variable with integer default value", default="8080", allow_private=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'port'})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3, option_4, option_5], properties=frozenset({"basic"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"}))
 option_8 = PortOption(name="variable1", doc="a port variable", allow_private=True, properties=frozenset({"basic", "mandatory"}), informations={'type': 'port'})
 option_9 = PortOption(name="variable2", doc="a port variable with default value", default="8080", allow_private=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'port'})
 option_10 = PortOption(name="variable3", doc="a port variable with integer default value", default="8080", allow_private=True, properties=frozenset({"mandatory", "standard"}), informations={'type': 'port'})
-optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_8, option_9, option_10], properties=frozenset({"basic"}))
+optiondescription_7 = OptionDescription(name="rougail", doc="Rougail", children=[option_8, option_9, option_10], properties=frozenset({"basic"}))
 optiondescription_6 = OptionDescription(name="2", doc="2", children=[optiondescription_7], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_6])

tests/dictionaries/00_6regexp/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,5 +12,5 @@ class Regexp_option_2(RegexpOption):
 Regexp_option_2._regexp = re_compile(r"^#(?:[0-9a-f]{3}){1,2}$")
 
 option_2 = Regexp_option_2(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp', 'test': ('#b1b1b1', '#b2b2b2')})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2], properties=frozenset({"standard"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])

tests/dictionaries/00_6regexp/tiramisu/multi.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -21,9 +17,9 @@ class Regexp_option_6(RegexpOption):
 Regexp_option_6._regexp = re_compile(r"^#(?:[0-9a-f]{3}){1,2}$")
 
 option_3 = Regexp_option_3(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp', 'test': ('#b1b1b1', '#b2b2b2')})
-optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_3], properties=frozenset({"standard"}))
+optiondescription_2 = OptionDescription(name="rougail", doc="Rougail", children=[option_3], properties=frozenset({"standard"}))
 optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"standard"}))
 option_6 = Regexp_option_6(name="var", doc="a first variable", default="#a1a1a1", properties=frozenset({"mandatory", "standard"}), informations={'type': 'regexp', 'test': ('#b1b1b1', '#b2b2b2')})
-optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_6], properties=frozenset({"standard"}))
+optiondescription_5 = OptionDescription(name="rougail", doc="Rougail", children=[option_6], properties=frozenset({"standard"}))
 optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"standard"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4])

tests/dictionaries/00_6string/tiramisu/base.py

@@ -3,10 +3,6 @@ from tiramisu.setting import ALLOWED_LEADER_PROPERTIES
 from re import compile as re_compile
 from rougail.tiramisu import func, dict_env, load_functions, ConvertDynOptionDescription
 load_functions('tests/dictionaries/../eosfunc/test.py')
-try:
-    groups.namespace
-except:
-    groups.addgroup('namespace')
 ALLOWED_LEADER_PROPERTIES.add("basic")
 ALLOWED_LEADER_PROPERTIES.add("standard")
 ALLOWED_LEADER_PROPERTIES.add("advanced")
@@ -16,5 +12,5 @@ option_4 = StrOption(name="var3", doc="the third variable", properties=frozenset
 option_5 = StrOption(name="var4", doc="the forth variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_6 = StrOption(name="var5", doc="the fifth variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
 option_7 = StrOption(name="var6", doc="the sixth variable", default="value", properties=frozenset({"mandatory", "standard"}), informations={'type': 'string'})
-optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", group_type=groups.namespace, children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"basic"}))
+optiondescription_1 = OptionDescription(name="rougail", doc="Rougail", children=[option_2, option_3, option_4, option_5, option_6, option_7], properties=frozenset({"basic"}))
 option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1])