xmlgenerator 0.2.0__tar.gz → 0.2.1__tar.gz

{xmlgenerator-0.2.0/xmlgenerator.egg-info → xmlgenerator-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmlgenerator
-Version: 0.2.0
+Version: 0.2.1
 Summary: Generates XML documents from XSD schemas
 Home-page: https://github.com/lexakimov/xmlgenerator
 Author: Alexey Akimov
@@ -247,6 +247,7 @@ In the `value_override` sections, you can specify either a string value or speci
 | `output_filename`                  | String described by the `output_filename_template` configuration parameter                                 |
 | `uuid`                             | Random UUIDv4                                                                                              |
 | `regex("pattern")`                 | Random string value matching the specified regular expression                                              |
+| `any('A', "B", C)`                 | Random value from enumeration                                                                              |
 | `number(A, B)`                     | Random number between A and B                                                                              |
 | `date("2010-01-01", "2025-01-01")` | Random date within the specified range                                                                     |
 | `last_name`                        | Last Name                                                                                                  |

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1}/README.md

@@ -218,6 +218,7 @@ In the `value_override` sections, you can specify either a string value or speci
 | `output_filename`                  | String described by the `output_filename_template` configuration parameter                                 |
 | `uuid`                             | Random UUIDv4                                                                                              |
 | `regex("pattern")`                 | Random string value matching the specified regular expression                                              |
+| `any('A', "B", C)`                 | Random value from enumeration                                                                              |
 | `number(A, B)`                     | Random number between A and B                                                                              |
 | `date("2010-01-01", "2025-01-01")` | Random date within the specified range                                                                     |
 | `last_name`                        | Last Name                                                                                                  |

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='xmlgenerator',
-    version='0.2.0',
+    version='0.2.1',
     packages=find_packages(exclude=("tests", "tests.*")),
     entry_points={
         'console_scripts': [

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1}/xmlgenerator/bootstrap.py

@@ -49,7 +49,7 @@ def _main():
 
     logger.debug('found %s schemas', len(xsd_files))
     for xsd_file in xsd_files:
-        logger.debug('processing schema: %s', xsd_file.name)
+        logger.info('processing schema: %s', xsd_file.name)
 
         # get configuration override for current schema
         local_config = config.get_for_file(xsd_file.name)

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1}/xmlgenerator/generator.py

@@ -1,7 +1,6 @@
 import logging
 import re
 
-import rstr
 import xmlschema
 from lxml import etree
 from xmlschema.validators import XsdComplexType, XsdAtomicRestriction, XsdTotalDigitsFacet, XsdElement, \
@@ -296,10 +295,11 @@ class XmlGenerator:
 
     def _generate_string(self, target_name, patterns, min_length, max_length):
         rnd = self.randomizer.rnd
+        re_gen = self.randomizer.re_gen
         if patterns is not None:
             # Генерация строки по regex
             random_pattern = rnd.choice(patterns)
-            xeger = rstr.xeger(random_pattern.attrib['value'])
+            xeger = re_gen.xeger(random_pattern.attrib['value'])
             xeger = re.sub(r'\s', ' ', xeger)
             if min_length > -1 and len(xeger) < min_length:
                 logger.warning(
@@ -358,29 +358,43 @@ class XmlGenerator:
         raise RuntimeError("not yet implemented")
 
     def _generate_datetime(self):
-        raise RuntimeError("not yet implemented")
+        random_datetime = self.randomizer.random_datetime()
+        formatted = random_datetime.isoformat()
+        return formatted
 
     def _generate_date(self):
-        raise RuntimeError("not yet implemented")
+        random_date = self.randomizer.random_date()
+        formatted = random_date.isoformat()
+        return formatted
 
     def _generate_time(self):
-        raise RuntimeError("not yet implemented")
+        random_time = self.randomizer.random_time()
+        formatted = random_time.isoformat()
+        return formatted
 
     def _generate_gyearmonth(self):
-        raise RuntimeError("not yet implemented")
+        random_date = self.randomizer.random_date()
+        formatted = random_date.strftime('%Y-%m')
+        return formatted
 
     def _generate_gyear(self):
         rnd = self.randomizer.rnd
-        return rnd.randint(2000, 2050)
+        return str(rnd.randint(2000, 2050))
 
     def _generate_gmonthday(self):
-        raise RuntimeError("not yet implemented")
+        random_date = self.randomizer.random_date()
+        formatted = random_date.strftime('--%m-%d')
+        return formatted
 
     def _generate_gday(self):
-        raise RuntimeError("not yet implemented")
+        random_date = self.randomizer.random_date()
+        formatted = random_date.strftime('---%d')
+        return formatted
 
     def _generate_gmonth(self):
-        raise RuntimeError("not yet implemented")
+        random_date = self.randomizer.random_date()
+        formatted = random_date.strftime('--%m--')
+        return formatted
 
     def _generate_hex_binary(self):
         raise RuntimeError("not yet implemented")

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1}/xmlgenerator/randomization.py

@@ -2,8 +2,9 @@ import logging
 import random
 import string
 import sys
-from datetime import datetime, timedelta
+from datetime import datetime, date, time, timedelta
 
+import rstr
 from faker import Faker
 
 logger = logging.getLogger(__name__)
@@ -20,6 +21,7 @@ class Randomizer:
         self.rnd = random.Random(seed)
         self.fake = Faker(locale='ru_RU')
         self.fake.seed_instance(seed)
+        self.re_gen = rstr.Rstr(self.rnd)
 
     def ascii_string(self, min_length=-1, max_length=-1):
         min_length = min_length if min_length and min_length > -1 else 1
@@ -31,7 +33,31 @@ class Randomizer:
         letters = string.ascii_letters  # Все буквы латиницы (a-z, A-Z)
         return ''.join(self.rnd.choice(letters) for _ in range(length))
 
-    def random_date(self, start_date: str, end_date: str) -> datetime:
+    def random_date(self, start_date: str = '1990-01-01', end_date: str = '2025-12-31') -> date:
+        # Преобразуем строки в объекты datetime
+        start = date.fromisoformat(start_date)
+        end = date.fromisoformat(end_date)
+
+        # Вычисляем разницу в днях между начальной и конечной датой
+        delta = (end - start).days
+
+        # Генерируем случайное количество дней в пределах delta
+        random_days = self.rnd.randint(0, delta)
+
+        # Добавляем случайное количество дней к начальной дате
+        return start + timedelta(days=random_days)
+
+    def random_time(self, start_time: str = '00:00:00', end_time: str = '23:59:59') -> time:
+        start = time.fromisoformat(start_time)
+        end = time.fromisoformat(end_time)
+
+        random_h = self.rnd.randint(start.hour, end.hour)
+        random_m = self.rnd.randint(start.minute, end.minute)
+        random_s = self.rnd.randint(start.second, end.second)
+
+        return time(hour=random_h, minute=random_m, second=random_s)
+
+    def random_datetime(self, start_date: str = '1990-01-01', end_date: str = '2025-12-31') -> datetime:
         # Преобразуем строки в объекты datetime
         start = datetime.strptime(start_date, "%Y-%m-%d")
         end = datetime.strptime(end_date, "%Y-%m-%d")

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1}/xmlgenerator/substitution.py

@@ -1,17 +1,16 @@
 import logging
 import re
-import uuid
-
-import rstr
 
 from xmlgenerator.randomization import Randomizer
 
 __all__ = ['Substitutor']
 
-_pattern = re.compile(pattern=r'\{\{\s*(?:(?P<function>\S*?)(?:\(\s*(?P<argument>[^)]*)\s*\))?\s*(?:\|\s*(?P<modifier>.*?))?)?\s*}}')
+_pattern = re.compile(
+    r'\{\{\s*(?:(?P<function>\S*?)(?:\(\s*(?P<argument>[^)]*)\s*\))?\s*(?:\|\s*(?P<modifier>.*?))?)?\s*}}')
 
 logger = logging.getLogger(__name__)
 
+
 class Substitutor:
     def __init__(self, randomizer: Randomizer):
         fake = randomizer.fake
@@ -20,18 +19,19 @@ class Substitutor:
         self._global_context = {}
         self.providers_dict = {
             # Функции локального контекста
-            "source_filename": lambda: self._local_context["source_filename"],
-            "source_extracted": lambda: self._local_context["source_extracted"],
-            "output_filename": lambda: self.get_output_filename(),
-
-            'uuid': lambda: str(uuid.uuid4()),
-            "regex": lambda a: rstr.xeger(a),
-            "number": self._rand_int,
-            "date": self._rand_date,
-
-            "last_name": fake.last_name_male,
-            "first_name": fake.first_name_male,
-            "middle_name": fake.middle_name_male,
+            'source_filename': lambda: self._local_context["source_filename"],
+            'source_extracted': lambda: self._local_context["source_extracted"],
+            'output_filename': lambda: self.get_output_filename(),
+
+            'uuid': lambda: fake.uuid4(),
+            'regex': self._rand_regex,
+            'any': self._rand_any,
+            'number': self._rand_int,
+            'date': self._rand_date,
+
+            'last_name': fake.last_name_male,
+            'first_name': fake.first_name_male,
+            'middle_name': fake.middle_name_male,
             'address_text': fake.address,
             'administrative_unit': fake.administrative_unit,
             'house_number': fake.building_number,
@@ -48,6 +48,16 @@ class Substitutor:
             'snils_formatted': randomizer.snils_formatted,
         }
 
+    def _rand_regex(self, a):
+        pattern = a.strip("'").strip('"')
+        return self.randomizer.re_gen.xeger(pattern)
+
+    def _rand_any(self, a):
+        args = str(a).split(sep=",")
+        value = self.randomizer.rnd.choice(args)
+        value = value.strip(' ').strip("'").strip('"')
+        return value
+
     def _rand_int(self, a):
         args = str(a).split(sep=",")
         return str(self.randomizer.rnd.randint(int(args[0]), int(args[1])))
@@ -56,8 +66,8 @@ class Substitutor:
         args = str(a).split(sep=",")
         date_from = args[0].strip(' ').strip("'").strip('"')
         date_until = args[1].strip(' ').strip("'").strip('"')
-        random_date = self.randomizer.random_date(date_from, date_until)
-        return random_date.strftime('%Y%m%d') # TODO externalize pattern
+        random_date = self.randomizer.random_datetime(date_from, date_until)
+        return random_date.strftime('%Y%m%d')  # TODO externalize pattern
 
     def reset_context(self, xsd_filename, config_local):
         self._local_context.clear()

{xmlgenerator-0.2.0 → xmlgenerator-0.2.1/xmlgenerator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmlgenerator
-Version: 0.2.0
+Version: 0.2.1
 Summary: Generates XML documents from XSD schemas
 Home-page: https://github.com/lexakimov/xmlgenerator
 Author: Alexey Akimov
@@ -247,6 +247,7 @@ In the `value_override` sections, you can specify either a string value or speci
 | `output_filename`                  | String described by the `output_filename_template` configuration parameter                                 |
 | `uuid`                             | Random UUIDv4                                                                                              |
 | `regex("pattern")`                 | Random string value matching the specified regular expression                                              |
+| `any('A', "B", C)`                 | Random value from enumeration                                                                              |
 | `number(A, B)`                     | Random number between A and B                                                                              |
 | `date("2010-01-01", "2025-01-01")` | Random date within the specified range                                                                     |
 | `last_name`                        | Last Name                                                                                                  |