kerykeion 4.7.0__tar.gz → 4.8.1__tar.gz

{kerykeion-4.7.0 → kerykeion-4.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.7.0
+Version: 4.8.1
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0
@@ -30,6 +30,7 @@ Requires-Dist: pyswisseph (>=2.10.3.1,<3.0.0.0)
 Requires-Dist: pytz (>=2022.7,<2023.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
 Requires-Dist: requests-cache (>=0.9.7,<0.10.0)
+Requires-Dist: scour (>=0.38.2,<0.39.0)
 Requires-Dist: terminaltables (>=3.1.10,<4.0.0)
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
 Description-Content-Type: text/markdown

{kerykeion-4.7.0 → kerykeion-4.8.1}/kerykeion/astrological_subject.py

@@ -170,7 +170,7 @@ class AstrologicalSubject:
 
         # This message is set to encourage the user to set a custom geonames username
         if geonames_username is None and online:
-            logging.info(
+            logging.warning(
                 "\n"
                 "********" +
                 "\n" +
@@ -191,19 +191,19 @@ class AstrologicalSubject:
 
         if not self.city:
             self.city = "London"
-            logging.warning("No city specified, using London as default")
+            logging.info("No city specified, using London as default")
 
         if not self.nation:
             self.nation = "GB"
-            logging.warning("No nation specified, using GB as default")
+            logging.info("No nation specified, using GB as default")
 
         if not self.lat:
             self.lat = 51.5074
-            logging.warning("No latitude specified, using London as default")
+            logging.info("No latitude specified, using London as default")
 
         if not self.lng:
             self.lng = 0
-            logging.warning("No longitude specified, using London as default")
+            logging.info("No longitude specified, using London as default")
 
         if (not self.online) and (not tz_str):
             raise KerykeionException(

{kerykeion-4.7.0 → kerykeion-4.8.1}/kerykeion/charts/charts_utils.py

@@ -394,4 +394,51 @@ def draw_transit_ring(r: Union[int, float], paper_1_color: str, zodiac_transit_r
     out = f'<circle cx="{r}" cy="{r}" r="{r - radius_offset}" style="fill: none; stroke: {paper_1_color}; stroke-width: 36px; stroke-opacity: .4;"/>'
     out += f'<circle cx="{r}" cy="{r}" r="{r}" style="fill: none; stroke: {zodiac_transit_ring_3_color}; stroke-width: 1px; stroke-opacity: .6;"/>'
 
-    return out
+    return out
+
+
+def draw_first_circle(r: Union[int, float], stroke_color: str, chart_type: ChartType, c1: Union[int, float, None] = None) -> str:
+    """
+    Draws the first circle.
+    
+    Args:
+        - r (Union[int, float]): The value of r.
+        - color (str): The color of the circle.
+        - chart_type (ChartType): The type of chart.
+        - c1 (Union[int, float]): The value of c1.
+        
+    Returns:
+        str: The SVG path of the first circle.
+    """
+    if chart_type == "Synastry" or chart_type == "Transit":
+        return f'<circle cx="{r}" cy="{r}" r="{r - 36}" style="fill: none; stroke: {stroke_color}; stroke-width: 1px; stroke-opacity:.4;" />'
+    else:
+        if c1 is None:
+            raise KerykeionException("c1 is None")
+
+        return f'<circle cx="{r}" cy="{r}" r="{r - c1}" style="fill: none; stroke: {stroke_color}; stroke-width: 1px; " />'
+
+
+def draw_second_circle(r: Union[int, float], stroke_color: str, fill_color: str, chart_type: ChartType, c2: Union[int, float, None] = None) -> str:
+    """
+    Draws the second circle.
+    
+    Args:
+        - r (Union[int, float]): The value of r.
+        - stroke_color (str): The color of the stroke.
+        - fill_color (str): The color of the fill.
+        - chart_type (ChartType): The type of chart.
+        - c2 (Union[int, float]): The value of c2.
+        
+    Returns:
+        str: The SVG path of the second circle.
+    """
+    
+    if chart_type == "Synastry" or chart_type == "Transit":
+        return f'<circle cx="{r}" cy="{r}" r="{r - 72}" style="fill: {fill_color}; fill-opacity:.4; stroke: {stroke_color}; stroke-opacity:.4; stroke-width: 1px" />'
+    
+    else:
+        if c2 is None:
+            raise KerykeionException("c2 is None")
+
+        return f'<circle cx="{r}" cy="{r}" r="{r - c2}" style="fill: {fill_color}; fill-opacity:.2; stroke: {stroke_color}; stroke-opacity:.4; stroke-width: 1px" />'

{kerykeion-4.7.0 → kerykeion-4.8.1}/kerykeion/charts/kerykeion_chart_svg.py

@@ -25,13 +25,17 @@ from kerykeion.charts.charts_utils import (
     convert_decimal_to_degree_string,
     draw_transit_ring_degree_steps,
     draw_degree_ring,
-    draw_transit_ring
+    draw_transit_ring,
+    draw_first_circle,
+    draw_second_circle
 )
 from pathlib import Path
+from scour.scour import scourString
 from string import Template
 from typing import Union, List
 
 
+
 class KerykeionChartSVG:
     """
     Creates the instance that can generate the chart with the
@@ -45,6 +49,11 @@ class KerykeionChartSVG:
         - lang: language settings (default: "EN")
         - new_settings_file: Set the settings file (default: kr.config.json)
     """
+    
+    # Constants
+    _DEFAULT_HEIGHT = 546.0
+    _DEFAULT_FULL_WIDTH = 1200
+    _DEFAULT_NATAL_WIDTH = 772.2
 
     # Set at init
     first_obj: AstrologicalSubject
@@ -64,8 +73,7 @@ class KerykeionChartSVG:
     c3: float
     homedir: Path
     xml_svg: Path
-    natal_width: float
-    full_width: float
+    width: Union[float, int]
     language_settings: dict
     chart_colors_settings: dict
     planets_settings: dict
@@ -85,8 +93,7 @@ class KerykeionChartSVG:
     t_points_sign: list
     t_points_retrograde: list
     t_houses_sign_graph: list
-    screen_width: float
-    screen_height: float
+    height: float
     location: str
     geolat: float
     geolon: float
@@ -114,10 +121,6 @@ class KerykeionChartSVG:
 
         self.xml_svg = DATA_DIR / "templates/chart.xml"
 
-        # SVG Width
-        self.natal_width = 772.2
-        self.full_width = 1200
-
         self.parse_json_settings(new_settings_file)
         self.chart_type = chart_type
 
@@ -215,11 +218,12 @@ class KerykeionChartSVG:
                 self.t_houses_sign_graph.append(h["sign_num"])
 
         # screen size
-        if self.chart_type == "Natal":
-            self.screen_width = 772.2
+        
+        self.height = self._DEFAULT_HEIGHT
+        if self.chart_type == "Synastry" or self.chart_type == "Transit":
+            self.width = self._DEFAULT_FULL_WIDTH
         else:
-            self.screen_width = 1200
-        self.screen_height = 772.2
+            self.width = self._DEFAULT_NATAL_WIDTH
 
         # default location
         self.location = self.user.city
@@ -250,8 +254,7 @@ class KerykeionChartSVG:
             {"name": "pisces", "element": "water"},
         )
 
-        # Immediately generate template.
-        self.template = self.makeTemplate()
+        self.template = None
 
     def set_output_directory(self, dir_path: Path) -> None:
         """
@@ -1152,13 +1155,6 @@ class KerykeionChartSVG:
         # Calculate the elements points
         self._calculate_elements_points_from_planets()
 
-        # width and height from screen
-        ratio = float(self.screen_width) / float(self.screen_height)
-        if ratio < 1.3:  # 1280x1024
-            wm_off = 130
-        else:  # 1024x768, 800x600, 1280x800, 1680x1050
-            wm_off = 100
-
         # Viewbox and sizing
         svgHeight = "100%"
         svgWidth = "100%"
@@ -1190,10 +1186,8 @@ class KerykeionChartSVG:
             td["degreeRing"] = draw_transit_ring_degree_steps(r, self.user.seventh_house.abs_pos)
 
             # circles
-            td["c1"] = f'cx="{r}" cy="{r}" r="{r - 36}"'
-            td["c1style"] = f'fill: none; stroke: {self.chart_colors_settings["zodiac_transit_ring_2"]}; stroke-width: 1px; stroke-opacity:.4;'
-            td["c2"] = 'cx="' + str(r) + '" cy="' + str(r) + '" r="' + str(r - 72) + '"'
-            td["c2style"] = f"fill: {self.chart_colors_settings['paper_1']}; fill-opacity:.4; stroke: {self.chart_colors_settings['zodiac_transit_ring_1']}; stroke-opacity:.4; stroke-width: 1px"
+            td["first_circle"] = draw_first_circle(r, self.chart_colors_settings["zodiac_transit_ring_2"], self.chart_type)
+            td["second_circle"] = draw_second_circle(r, self.chart_colors_settings['zodiac_transit_ring_1'], self.chart_colors_settings['paper_1'], self.chart_type)
 
             td["c3"] = 'cx="' + str(r) + '" cy="' + str(r) + '" r="' + str(r - 160) + '"'
             td["c3style"] = f"fill: {self.chart_colors_settings['paper_1']}; fill-opacity:.8; stroke: {self.chart_colors_settings['zodiac_transit_ring_0']}; stroke-width: 1px"
@@ -1201,23 +1195,23 @@ class KerykeionChartSVG:
             td["makeAspects"] = self._makeAspectsTransit(r, (r - 160))
             td["makeAspectGrid"] = self._makeAspectTransitGrid(r)
             td["makePatterns"] = ""
-            td["chart_width"] = self.full_width
         else:
             td["transitRing"] = ""
             td["degreeRing"] = draw_degree_ring(r, self.c1, self.user.seventh_house.abs_pos, self.chart_colors_settings["paper_0"])
 
-            # circles
-            td["c1"] = f'cx="{r}" cy="{r}" r="{r - self.c1}"'
-            td["c1style"] = f'fill: none; stroke: {self.chart_colors_settings["zodiac_radix_ring_2"]}; stroke-width: 1px; '
-            td["c2"] = f'cx="{r}" cy="{r}" r="{r - self.c2}"'
-            td["c2style"] = f'fill: {self.chart_colors_settings["paper_1"]}; fill-opacity:.2; stroke: {self.chart_colors_settings["zodiac_radix_ring_1"]}; stroke-opacity:.4; stroke-width: 1px'
+            td['first_circle'] = draw_first_circle(r, self.chart_colors_settings["zodiac_radix_ring_2"], self.chart_type, self.c1)
+
+            td["second_circle"] = draw_second_circle(r, self.chart_colors_settings["zodiac_radix_ring_1"], self.chart_colors_settings["paper_1"], self.chart_type, self.c2)
+            
             td["c3"] = f'cx="{r}" cy="{r}" r="{r - self.c3}"'
             td["c3style"] = f'fill: {self.chart_colors_settings["paper_1"]}; fill-opacity:.8; stroke: {self.chart_colors_settings["zodiac_radix_ring_0"]}; stroke-width: 1px'
+            
             td["makeAspects"] = self._makeAspects(r, (r - self.c3))
             td["makeAspectGrid"] = self._makeAspectGrid(r)
             td["makePatterns"] = self._makePatterns()
-            td["chart_width"] = self.natal_width
-
+        
+        td["chart_height"] = self.height
+        td["chart_width"] = self.width
         td["circleX"] = str(0)
         td["circleY"] = str(0)
         td["svgWidth"] = str(svgWidth)
@@ -1379,7 +1373,7 @@ class KerykeionChartSVG:
 
         return td
 
-    def makeTemplate(self):
+    def makeTemplate(self, minify: bool = False) -> str:
         """Creates the template for the SVG file"""
         td = self._createTemplateDictionary()
 
@@ -1392,13 +1386,20 @@ class KerykeionChartSVG:
         logging.debug(f"Template dictionary keys: {td.keys()}")
 
         self._createTemplateDictionary()
-        return template.replace('"', "'")
 
-    def makeSVG(self) -> None:
+        if minify:
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+
+        else:
+            template = template.replace('"', "'")
+
+        return template
+
+    def makeSVG(self, minify: bool = False):
         """Prints out the SVG file in the specifide folder"""
 
         if not (self.template):
-            self.template = self.makeTemplate()
+            self.template = self.makeTemplate(minify)
 
         self.chartname = self.output_directory / f"{self.user.name}{self.chart_type}Chart.svg"
 
@@ -1425,8 +1426,9 @@ if __name__ == "__main__":
 
     # Synastry Chart
     synastry_chart = KerykeionChartSVG(first, "Synastry", second)
-    synastry_chart.makeSVG()
+    synastry_chart.makeSVG(minify=True)
 
     # Transits Chart
     transits_chart = KerykeionChartSVG(first, "Transit", second)
-    transits_chart.makeSVG()
+    transits_chart.makeSVG(minify=True)
+

{kerykeion-4.7.0 → kerykeion-4.8.1}/kerykeion/charts/templates/chart.xml

@@ -12,7 +12,7 @@
     <g transform="translate($cfgTranslate)">
         <g transform="rotate($cfgRotate)">
             <g transform="scale($cfgZoom)">
-                <rect x="0" y="0" width="$chart_width" height="546.0" style="fill: $paper_color_1" />
+                <rect class="background-rectangle" x="0" y="0" width="$chart_width" height="$chart_height" style="fill: $paper_color_1" />
                 <text x="20" y="30" style="fill: $paper_color_0; font-size: 24px">$stringTitle</text>
                 <text x="20" y="50" style="fill: $paper_color_0; font-size: 11px">$stringName</text>
                 <text x="20" y="62" style="fill: $paper_color_0; font-size: 11px">$stringLocation</text>
@@ -471,10 +471,10 @@
                         $makeZodiac 
 
                         <!-- First Circle -->
-                        <circle $c1 style="$c1style" />
+                        $first_circle
 
                         <!-- Second Circle -->
-                        <circle $c2 style="$c2style" />
+                        $second_circle
 
                         <!-- Third Circle -->
                         <circle $c3 style="$c3style" />

{kerykeion-4.7.0 → kerykeion-4.8.1}/kerykeion/fetch_geonames.py

@@ -82,7 +82,9 @@ class FetchGeonames:
             "contry": country_code,
             "username": self.username,
             "maxRows": 1,
-            "style": "FULL",
+            "style": "SHORT",
+            "featureClass": "A",
+            "featureClass": "P",
         }
 
         prepared_request = Request("GET", self.base_url, params=params).prepare()
@@ -91,6 +93,7 @@ class FetchGeonames:
         try:
             response = self.session.send(prepared_request)
             response_json = response.json()
+            logging.debug(f"Response from GeoNames: {response_json}")
 
         except Exception as e:
             logging.error(f"Error in fetching {self.base_url}: {e}")
@@ -133,5 +136,5 @@ if __name__ == "__main__":
     from kerykeion.utilities import setup_logging
     setup_logging(level="debug")
 
-    geonames = FetchGeonames("Roma", "IT")
+    geonames = FetchGeonames("Montichiari", "IT")
     print(geonames.get_serialized_data())

{kerykeion-4.7.0 → kerykeion-4.8.1}/kerykeion/kr_types/chart_types.py

@@ -4,15 +4,14 @@ from typing import TypedDict
 class ChartTemplateDictionary(TypedDict):
     transitRing: str
     degreeRing: str
-    c1: str
-    c1style: str
-    c2: str
-    c2style: str
+    first_circle: str
+    second_circle: str
     c3: str
     c3style: str
     makeAspects: str
     makeAspectGrid: str
     makePatterns: str
+    chart_height: float
     chart_width: float
     circleX: str
     circleY: str

{kerykeion-4.7.0 → kerykeion-4.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.7.0"
+version = "4.8.1"
 authors = ["Giacomo Battaglia <battaglia.giacomo@yahoo.it>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"
@@ -48,6 +48,7 @@ requests = "^2.28.1"
 requests-cache = "^0.9.7"
 pydantic = "^2.5"
 terminaltables = "^3.1.10"
+scour = "^0.38.2"
 
 [tool.poetry.scripts]
 create-docs = "scripts.docs:main"