PyPI - PyJHora - Versions diffs - 4.7.0__tar.gz → 4.8.0__tar.gz - Mend

PyJHora 4.7.0tar.gz → 4.8.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (390) hide show

{pyjhora-4.7.0/src/PyJHora.egg-info → pyjhora-4.8.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyJHora
-Version: 4.7.0
+Version: 4.8.0
 Summary: Complete Vedic Astrology Python package.
 Author-email: Sundar Sundaresan <carnaticmusicguru2015@comcast.net>
 License:  GNU AFFERO GENERAL PUBLIC LICENSE
@@ -678,7 +678,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
-JHora 4.7.0
+JHora 4.8.0
 =================
 Python package containing almost all the features described in the book
@@ -779,6 +779,23 @@ Click Show Chart to display the birth (Raasi and Navamsam) charts (every time an
 Click Show PDF to save the screen as a PDF file
+Changes since 4.7.0
+===================
+* MAJOR CHANGE: NOTE: ALL DHASA NOW RETURN IN THE FORMAT: [ [(LORDS), DHASA_START, DURATION]...]. DHASA_START IS NO LONGER A DATE STRING (1997-01-01 13:04:50 AM) BUT DATE TUPLE (Y,M,D,FH).
+* Added `jhora.horoscope.dhasa.graha.rashmi` Rashmi Dhasa Bhukthi. It provides 3 methods based on order dhasa progression: 1=Highest Ray (BPHS), 2=Natural (Naisargika Sun to Saturn order), 3=Vimshottari Order (you can choose seed star as well).
+* Added `jhora.horoscope.dhasa.raasi.raashiyanka` dhasa. It provides 2 methods: 1=BPHS (Tara Chand Shastri), 2=BPHS (Ganesh Dutt Pathak).
+* Added `jhora.horoscope.dhasa.graha.ashtaka_varga` and ``jhora.horoscope.dhasa.raasi.ashtaka_varga` as both graha and raasi dhasa based on 2 references:
+[AstroSutras using BAV](https://astrosutras.in/index.php/2025/03/04/ashtakavarga-dasha-system/) and
+[Astronidan using SAV](https://astronidan.com/dashas/ashtakavarga-dasha).
+Since I could not find algorithmic details I have used CoPilot to calculate this dhasa. Provided combinations of choosing BAV,SAV or shodhaya Pindas to decide dhasa lords, start_rule using strength,user defined planet/zodiac, dhasa order using strength or zodiacal etc. This is an experimental dhasa since I dont know real algorithm. Let me know if there are any concrete algorithm for this.
+* Added `jhora.horoscope.dhasa.panchasvara` and `jhora.horoscope.dhasa.sudharsana_chakra` dhasa
+* Added `jhora.horoscope.dhasa.raasi.chathuvidha_utthara` dhasa with four methods (Lagna, Kendra, Trikona and Dasha).
+* Eclipse module has been updated. Option given to show maximum eclipse location. Requires `import reverse_geocode`.
+* Added Nakshathra Dhasa Progression to graha dhasas as `nakshathra_dhasa_progression`. Also added an argument `dhasa_progression_correction` to every planet, subplanet, special lagna calculations. Added this as an option in the `horo_chart_tabs` UI.
+* Added 2 functions to each dhasa `xxxx_immediate_children` to get immediate child level dhasa for a given parent dhasa, and `get_running_dhasa_for_given_date` function to get running dhasa for given julian day number and dhasa_periods. Added this as right click menu on the dhasa bhukthi tab of `horo_chart_tabs` UI.
+* Added `house.order_of_raasis_by_strength` function.
+* removed global variables _ayanamsa_mode and _ayanamsa_value and set_ayanamsa_mode and reset_ayanamsa_mode that were repeatedly called were also removed - as requested by a user.
+* few minor fixes to yoga.py
 Changes since 4.6.0
 ===================

{pyjhora-4.7.0 → pyjhora-4.8.0}/README.md RENAMED Viewed

@@ -1,4 +1,4 @@
-JHora 4.7.0
+JHora 4.8.0
 =================
 Python package containing almost all the features described in the book
@@ -99,6 +99,23 @@ Click Show Chart to display the birth (Raasi and Navamsam) charts (every time an
 Click Show PDF to save the screen as a PDF file
+Changes since 4.7.0
+===================
+* MAJOR CHANGE: NOTE: ALL DHASA NOW RETURN IN THE FORMAT: [ [(LORDS), DHASA_START, DURATION]...]. DHASA_START IS NO LONGER A DATE STRING (1997-01-01 13:04:50 AM) BUT DATE TUPLE (Y,M,D,FH).
+* Added `jhora.horoscope.dhasa.graha.rashmi` Rashmi Dhasa Bhukthi. It provides 3 methods based on order dhasa progression: 1=Highest Ray (BPHS), 2=Natural (Naisargika Sun to Saturn order), 3=Vimshottari Order (you can choose seed star as well).
+* Added `jhora.horoscope.dhasa.raasi.raashiyanka` dhasa. It provides 2 methods: 1=BPHS (Tara Chand Shastri), 2=BPHS (Ganesh Dutt Pathak).
+* Added `jhora.horoscope.dhasa.graha.ashtaka_varga` and ``jhora.horoscope.dhasa.raasi.ashtaka_varga` as both graha and raasi dhasa based on 2 references:
+[AstroSutras using BAV](https://astrosutras.in/index.php/2025/03/04/ashtakavarga-dasha-system/) and
+[Astronidan using SAV](https://astronidan.com/dashas/ashtakavarga-dasha).
+Since I could not find algorithmic details I have used CoPilot to calculate this dhasa. Provided combinations of choosing BAV,SAV or shodhaya Pindas to decide dhasa lords, start_rule using strength,user defined planet/zodiac, dhasa order using strength or zodiacal etc. This is an experimental dhasa since I dont know real algorithm. Let me know if there are any concrete algorithm for this.
+* Added `jhora.horoscope.dhasa.panchasvara` and `jhora.horoscope.dhasa.sudharsana_chakra` dhasa
+* Added `jhora.horoscope.dhasa.raasi.chathuvidha_utthara` dhasa with four methods (Lagna, Kendra, Trikona and Dasha).
+* Eclipse module has been updated. Option given to show maximum eclipse location. Requires `import reverse_geocode`.
+* Added Nakshathra Dhasa Progression to graha dhasas as `nakshathra_dhasa_progression`. Also added an argument `dhasa_progression_correction` to every planet, subplanet, special lagna calculations. Added this as an option in the `horo_chart_tabs` UI.
+* Added 2 functions to each dhasa `xxxx_immediate_children` to get immediate child level dhasa for a given parent dhasa, and `get_running_dhasa_for_given_date` function to get running dhasa for given julian day number and dhasa_periods. Added this as right click menu on the dhasa bhukthi tab of `horo_chart_tabs` UI.
+* Added `house.order_of_raasis_by_strength` function.
+* removed global variables _ayanamsa_mode and _ayanamsa_value and set_ayanamsa_mode and reset_ayanamsa_mode that were repeatedly called were also removed - as requested by a user.
+* few minor fixes to yoga.py
 Changes since 4.6.0
 ===================

{pyjhora-4.7.0 → pyjhora-4.8.0}/pyproject.toml RENAMED Viewed

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "PyJHora"
 description = "Complete Vedic Astrology Python package."
-version = "4.7.0"
+version = "4.8.0"
 authors = [
 	{name="Sundar Sundaresan",email = "carnaticmusicguru2015@comcast.net"},
 ]

{pyjhora-4.7.0 → pyjhora-4.8.0/src/PyJHora.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyJHora
-Version: 4.7.0
+Version: 4.8.0
 Summary: Complete Vedic Astrology Python package.
 Author-email: Sundar Sundaresan <carnaticmusicguru2015@comcast.net>
 License:  GNU AFFERO GENERAL PUBLIC LICENSE
@@ -678,7 +678,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
-JHora 4.7.0
+JHora 4.8.0
 =================
 Python package containing almost all the features described in the book
@@ -779,6 +779,23 @@ Click Show Chart to display the birth (Raasi and Navamsam) charts (every time an
 Click Show PDF to save the screen as a PDF file
+Changes since 4.7.0
+===================
+* MAJOR CHANGE: NOTE: ALL DHASA NOW RETURN IN THE FORMAT: [ [(LORDS), DHASA_START, DURATION]...]. DHASA_START IS NO LONGER A DATE STRING (1997-01-01 13:04:50 AM) BUT DATE TUPLE (Y,M,D,FH).
+* Added `jhora.horoscope.dhasa.graha.rashmi` Rashmi Dhasa Bhukthi. It provides 3 methods based on order dhasa progression: 1=Highest Ray (BPHS), 2=Natural (Naisargika Sun to Saturn order), 3=Vimshottari Order (you can choose seed star as well).
+* Added `jhora.horoscope.dhasa.raasi.raashiyanka` dhasa. It provides 2 methods: 1=BPHS (Tara Chand Shastri), 2=BPHS (Ganesh Dutt Pathak).
+* Added `jhora.horoscope.dhasa.graha.ashtaka_varga` and ``jhora.horoscope.dhasa.raasi.ashtaka_varga` as both graha and raasi dhasa based on 2 references:
+[AstroSutras using BAV](https://astrosutras.in/index.php/2025/03/04/ashtakavarga-dasha-system/) and
+[Astronidan using SAV](https://astronidan.com/dashas/ashtakavarga-dasha).
+Since I could not find algorithmic details I have used CoPilot to calculate this dhasa. Provided combinations of choosing BAV,SAV or shodhaya Pindas to decide dhasa lords, start_rule using strength,user defined planet/zodiac, dhasa order using strength or zodiacal etc. This is an experimental dhasa since I dont know real algorithm. Let me know if there are any concrete algorithm for this.
+* Added `jhora.horoscope.dhasa.panchasvara` and `jhora.horoscope.dhasa.sudharsana_chakra` dhasa
+* Added `jhora.horoscope.dhasa.raasi.chathuvidha_utthara` dhasa with four methods (Lagna, Kendra, Trikona and Dasha).
+* Eclipse module has been updated. Option given to show maximum eclipse location. Requires `import reverse_geocode`.
+* Added Nakshathra Dhasa Progression to graha dhasas as `nakshathra_dhasa_progression`. Also added an argument `dhasa_progression_correction` to every planet, subplanet, special lagna calculations. Added this as an option in the `horo_chart_tabs` UI.
+* Added 2 functions to each dhasa `xxxx_immediate_children` to get immediate child level dhasa for a given parent dhasa, and `get_running_dhasa_for_given_date` function to get running dhasa for given julian day number and dhasa_periods. Added this as right click menu on the dhasa bhukthi tab of `horo_chart_tabs` UI.
+* Added `house.order_of_raasis_by_strength` function.
+* removed global variables _ayanamsa_mode and _ayanamsa_value and set_ayanamsa_mode and reset_ayanamsa_mode that were repeatedly called were also removed - as requested by a user.
+* few minor fixes to yoga.py
 Changes since 4.6.0
 ===================

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/PyJHora.egg-info/SOURCES.txt RENAMED Viewed

@@ -41,7 +41,7 @@ src/jhora/experiments/naadi_marriage.py
 src/jhora/experiments/sensitive_point.py
 src/jhora/horoscope/README.md
 src/jhora/horoscope/__init__.py
-src/jhora/horoscope/main.py
+src/jhora/horoscope/info.py
 src/jhora/horoscope/chart/README.md
 src/jhora/horoscope/chart/__init__.py
 src/jhora/horoscope/chart/arudhas.py
@@ -56,11 +56,15 @@ src/jhora/horoscope/chart/strength.py
 src/jhora/horoscope/chart/yoga.py
 src/jhora/horoscope/dhasa/README.md
 src/jhora/horoscope/dhasa/__init__.py
+src/jhora/horoscope/dhasa/panchasvara.py
 src/jhora/horoscope/dhasa/sudharsana_chakra.py
+src/jhora/horoscope/dhasa/annual/__init__.py
 src/jhora/horoscope/dhasa/annual/mudda.py
 src/jhora/horoscope/dhasa/annual/patyayini.py
+src/jhora/horoscope/dhasa/graha/__init__.py
 src/jhora/horoscope/dhasa/graha/aayu.py
 src/jhora/horoscope/dhasa/graha/applicability.py
+src/jhora/horoscope/dhasa/graha/ashtaka_varga.py
 src/jhora/horoscope/dhasa/graha/ashtottari.py
 src/jhora/horoscope/dhasa/graha/buddhi_gathi.py
 src/jhora/horoscope/dhasa/graha/chathuraaseethi_sama.py
@@ -69,8 +73,10 @@ src/jhora/horoscope/dhasa/graha/dwisatpathi.py
 src/jhora/horoscope/dhasa/graha/kaala.py
 src/jhora/horoscope/dhasa/graha/karaka.py
 src/jhora/horoscope/dhasa/graha/karana_chathuraaseethi_sama.py
+src/jhora/horoscope/dhasa/graha/moola.py
 src/jhora/horoscope/dhasa/graha/naisargika.py
 src/jhora/horoscope/dhasa/graha/panchottari.py
+src/jhora/horoscope/dhasa/graha/rashmi.py
 src/jhora/horoscope/dhasa/graha/saptharishi_nakshathra.py
 src/jhora/horoscope/dhasa/graha/sataatbika.py
 src/jhora/horoscope/dhasa/graha/shastihayani.py
@@ -85,17 +91,20 @@ src/jhora/horoscope/dhasa/graha/yogini.py
 src/jhora/horoscope/dhasa/raasi/brahma.py
 src/jhora/horoscope/dhasa/raasi/chakra.py
 src/jhora/horoscope/dhasa/raasi/chara.py
+src/jhora/horoscope/dhasa/raasi/chathurvidha_utthara.py
 src/jhora/horoscope/dhasa/raasi/drig.py
 src/jhora/horoscope/dhasa/raasi/kalachakra.py
+src/jhora/horoscope/dhasa/raasi/karaka_kendraadhi.py
 src/jhora/horoscope/dhasa/raasi/kendradhi_rasi.py
+src/jhora/horoscope/dhasa/raasi/lagna_kendraadhi.py
 src/jhora/horoscope/dhasa/raasi/lagnamsaka.py
 src/jhora/horoscope/dhasa/raasi/mandooka.py
-src/jhora/horoscope/dhasa/raasi/moola.py
 src/jhora/horoscope/dhasa/raasi/narayana.py
 src/jhora/horoscope/dhasa/raasi/navamsa.py
-src/jhora/horoscope/dhasa/raasi/nirayana.py
+src/jhora/horoscope/dhasa/raasi/niryaana.py
 src/jhora/horoscope/dhasa/raasi/padhanadhamsa.py
 src/jhora/horoscope/dhasa/raasi/paryaaya.py
+src/jhora/horoscope/dhasa/raasi/raashiyanka.py
 src/jhora/horoscope/dhasa/raasi/sandhya.py
 src/jhora/horoscope/dhasa/raasi/shoola.py
 src/jhora/horoscope/dhasa/raasi/sthira.py
@@ -305,9 +314,7 @@ src/jhora/tests/book_chart_data.py
 src/jhora/tests/pvr_tests.py
 src/jhora/tests/stronger_rasi_examples.txt
 src/jhora/tests/test_helper.py
-src/jhora/tests/test_outputs_lahiri_mean_nodes - Copy.json
 src/jhora/tests/test_outputs_lahiri_mean_nodes.json
-src/jhora/tests/test_outputs_pushya_true_nodes - Copy.json
 src/jhora/tests/test_outputs_pushya_true_nodes.json
 src/jhora/tests/test_ss.py
 src/jhora/tests/test_ui.py
@@ -316,7 +323,6 @@ src/jhora/ui/__init__.py
 src/jhora/ui/chakra.py
 src/jhora/ui/chart_styles.py
 src/jhora/ui/conjunction.py
-src/jhora/ui/conjunction_old.py
 src/jhora/ui/dhasa_bhukthi_options_dialog.py
 src/jhora/ui/horo_chart.py
 src/jhora/ui/horo_chart_tabs.py

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/README.md RENAMED Viewed

@@ -1,4 +1,4 @@
-JHora 4.7.0
+JHora 4.8.0
 =================
 Python package containing almost all the features described in the book
@@ -99,6 +99,23 @@ Click Show Chart to display the birth (Raasi and Navamsam) charts (every time an
 Click Show PDF to save the screen as a PDF file
+Changes since 4.7.0
+===================
+* MAJOR CHANGE: NOTE: ALL DHASA NOW RETURN IN THE FORMAT: [ [(LORDS), DHASA_START, DURATION]...]. DHASA_START IS NO LONGER A DATE STRING (1997-01-01 13:04:50 AM) BUT DATE TUPLE (Y,M,D,FH).
+* Added `jhora.horoscope.dhasa.graha.rashmi` Rashmi Dhasa Bhukthi. It provides 3 methods based on order dhasa progression: 1=Highest Ray (BPHS), 2=Natural (Naisargika Sun to Saturn order), 3=Vimshottari Order (you can choose seed star as well).
+* Added `jhora.horoscope.dhasa.raasi.raashiyanka` dhasa. It provides 2 methods: 1=BPHS (Tara Chand Shastri), 2=BPHS (Ganesh Dutt Pathak).
+* Added `jhora.horoscope.dhasa.graha.ashtaka_varga` and ``jhora.horoscope.dhasa.raasi.ashtaka_varga` as both graha and raasi dhasa based on 2 references:
+[AstroSutras using BAV](https://astrosutras.in/index.php/2025/03/04/ashtakavarga-dasha-system/) and
+[Astronidan using SAV](https://astronidan.com/dashas/ashtakavarga-dasha).
+Since I could not find algorithmic details I have used CoPilot to calculate this dhasa. Provided combinations of choosing BAV,SAV or shodhaya Pindas to decide dhasa lords, start_rule using strength,user defined planet/zodiac, dhasa order using strength or zodiacal etc. This is an experimental dhasa since I dont know real algorithm. Let me know if there are any concrete algorithm for this.
+* Added `jhora.horoscope.dhasa.panchasvara` and `jhora.horoscope.dhasa.sudharsana_chakra` dhasa
+* Added `jhora.horoscope.dhasa.raasi.chathuvidha_utthara` dhasa with four methods (Lagna, Kendra, Trikona and Dasha).
+* Eclipse module has been updated. Option given to show maximum eclipse location. Requires `import reverse_geocode`.
+* Added Nakshathra Dhasa Progression to graha dhasas as `nakshathra_dhasa_progression`. Also added an argument `dhasa_progression_correction` to every planet, subplanet, special lagna calculations. Added this as an option in the `horo_chart_tabs` UI.
+* Added 2 functions to each dhasa `xxxx_immediate_children` to get immediate child level dhasa for a given parent dhasa, and `get_running_dhasa_for_given_date` function to get running dhasa for given julian day number and dhasa_periods. Added this as right click menu on the dhasa bhukthi tab of `horo_chart_tabs` UI.
+* Added `house.order_of_raasis_by_strength` function.
+* removed global variables _ayanamsa_mode and _ayanamsa_value and set_ayanamsa_mode and reset_ayanamsa_mode that were repeatedly called were also removed - as requested by a user.
+* few minor fixes to yoga.py
 Changes since 4.6.0
 ===================

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/_package_info.py RENAMED Viewed

@@ -18,7 +18,7 @@
 name = "PyJHora"
-version = "4.7.0"
+version = "4.8.0"
 author = "Sundar Sundaresan"

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/const.py RENAMED Viewed

@@ -79,13 +79,14 @@ def set_node_mode(use_true: bool) -> None:
     _KETU = -10 if _use_true_nodes_for_rahu_ketu else -swe.MEAN_NODE
 SUN_TO_SATURN = [*range(SUN_ID,SATURN_ID+1)]
 SUN_TO_KETU = [*range(SUN_ID,KETU_ID+1)]
+SUN_TO_PLUTO = [*range(SUN_ID,PLUTO_ID+1)]
 HOUSE_1 = 0; HOUSE_2 = 1; HOUSE_3 = 2; HOUSE_4 = 3; HOUSE_5 = 4; HOUSE_6 = 5
 HOUSE_7 = 6; HOUSE_8 = 7; HOUSE_9 = 8; HOUSE_10 = 9; HOUSE_11 = 10; HOUSE_12 = 11
 ARIES = 0; TAURUS = 1; GEMINI = 2; CANCER = 3; LEO = 4; VIRGO = 5; LIBRA = 6
 SCORPIO = 7; SAGITTARIUS = 8; CAPRICORN = 9; AQUARIUS = 10; PISCES = 11
 MESHAM = ARIES; RISHABAM = TAURUS; MITHUNAM = GEMINI; KATAKAM = CANCER; SIMMAM = LEO; KANNI = VIRGO; THULAM = LIBRA
 VIRUCHIGAM=SCORPIO; DHANUS=SAGITTARIUS; MAKARAM=CAPRICORN;KUMBAM=AQUARIUS;MEENAM=PISCES
-_pp_count_upto_saturn = 8; _pp_count_upto_ketu = 10; _pp_count_upto_rahu = 9
+_pp_count_upto_saturn = 8; _pp_count_upto_ketu = 10; _pp_count_upto_rahu = 9; _pp_count_upto_pluto = 13
 _planets_upto_ketu = 9; _planets_upto_saturn = 7; _planets_upto_rahu = 8
 """ Surya Siddhantha Constants """
@@ -254,6 +255,8 @@ kalachakra_rasis_list = sum(savya_stars_1_rasis,[])+sum(savya_stars_2_rasis,[])+
 #print(kalachakra_rasis_list)
 kalachakra_paramayush = [savya_stars_1_rasis_paramayush,savya_stars_2_rasis_paramayush,apasavya_stars_1_rasis_paramayush,apasavya_stars_2_rasis_paramayush]
+# dict of benefic houses for a planet to occupy with respect to another planet
+# For example dict[0][3] = 3,5,6... Which means 3,4,5.. are the benefic houses from Mercury for sun to occupy
 ashtaka_varga_dict={ #7 is used for Lagna here
     "0":[[1,2,4,7,8,9,10,11],[3,6,10,11],[1,2,4,7,8,9,10,11],[3,5,6,9,10,11,12],[5,6,9,11],[6,7,12],[1,2,4,7,8,9,10,11],[3,4,6,10,11,12]],
     "1":[[3,6,7,8,10,11 ],[1,3,6,7,9,10,11],[2,3,5,6,10,11],[1,3,4,5,7,8,10,11],[1,2,4,7,8,10,11],[3,4,5,7,9,10,11],[3,5,6,11],[3,6,10,11]],
@@ -460,7 +463,7 @@ hadda_lords = [[(4,6),(5,12),(3,20),(2,25),(6,30)], #Aries (planet, long_degree_
                [(5,12),(4,16),(3,19),(2,28),(6,30)]] #Pisces
 hadda_points = [15,7.5,3.75] # [15,11.5,7.5,3.75] # Own, Friend, Enemy, Neutral
 " Narayana Dhasa constants "
-human_life_span_for_narayana_dhasa = 120
+human_life_span_for_narayana_dhasa = 144
 narayana_dhasa_normal_progression = \
     [[0,1,2,3,4,5,6,7,8,9,10,11],
     [1,8,3,10,5,0,7,2,9,4,11,6],
@@ -618,7 +621,7 @@ include_special_and_arudha_lagna_in_charts = True # V3.1.9
     See Dr. Jayasree Saranatha Mahabharatha date validation book
 """
 increase_tithi_by_one_before_kali_yuga = True
-mahabharatha_tithi_julian_day = 588465.5
+mahabharatha_tithi_julian_day = 588465.0
 use_aharghana_for_vaara_calcuation = False # V4.4.5
 minimum_separation_longitude=0.00001
@@ -627,7 +630,7 @@ include_charts_only_for_western_type = False
 include_maandhi_in_charts=True
 _PRAVESHA_LIST = ['birth_str','annual_str','tithi_pravesha_str','lunar_month_year_str','present_str','planetary_conjunctions_str',
                   'planet_transit_str','vakra_gathi_change_str','eclipse_str','prenatal_time_str','vrathas_str',
-                  'customized_str']
+                  'customized_str','nakshathra_dhasa_progression_str']
 sphuta_list = ["tri","chatur","pancha","prana","deha","mrityu","sookshma_tri","beeja","kshetra","tithi","yoga",
                "rahu_tithi","yogi","avayogi"]
 ashtottari_bhukthi_starts_from_dhasa_lord = True #PVR Book says this should be False. But JHora has this True
@@ -750,13 +753,6 @@ kalachakra_navamsa = {0:[0,1,2,3], 1:[4,5,6,7], 2:[8,9,10,11], 3:[7,6,5,3], 4:[4
 varga_option_dict = {2:(6,1),3:(5,1),4:(4,1),5:(4,1),6:(4,1),7:(6,1),8:(4,1),9:(5,1),10:(6,1),11:(5,1),12:(5,1),16:(4,1),
                       20:(4,1),24:(3,1),27:(4,1),30:(5,1),40:(4,1),45:(4,1),60:(4,1),81:(3,1),108:(4,1),144:(4,1)
                       }
-dhasa_default_options={0:[False,2,1,0,0,0,-1],1:[False,0],2:[True,False,2,1,0,0,0,-1],3:[False,5,1,0,0,0,-1],
-                       4:[0,False,2],5:[False,6,1,0,0,0,-1],6:[0,False,0],7:[False,7,1,0,0,0,-1],
-                       8:[False,26,1,0,0,0,-1],9:[False,18,1,0,0,0,-1],10:[False,16,1,0,0,0,-1],
-                       11:[False,26,1,0,0,0,-1],12:[False,14,1,0,0,0,-1],13:[False,0],14:[False,0,1,0,0,0,-1],
-                       15:[False,21,1,0,0,0,-1],16:[True,False,False],17:[0,0,-1],18:[],19:[0,-1],20:[],
-                       21:[3],22:[False,1,0,0,0,-1]
-                       }
 MAX_DHASAVARGA_FACTOR = 300
 DEFAULT_CUSTOM_VARGA_FACTOR=57
 # If True standard vargas such as D2,D3 etc will follow custom calculations and not standard calculations
@@ -1262,8 +1258,9 @@ check_yogas_on_all_divisional_charts = False
 naisargika_karakas = [SUN_ID, JUPITER_ID, MARS_ID, MOON_ID, JUPITER_ID, MARS_ID, VENUS_ID, SATURN_ID, JUPITER_ID,
                       MERCURY_ID, JUPITER_ID, SATURN_ID]
-class MAHA_DHASA_DEPTH:
+from enum import IntEnum, unique
+@unique
+class MAHA_DHASA_DEPTH(IntEnum):
     MAHA_DHASA_ONLY   = 1   # Maha only (no Antara)
     ANTARA      = 2   # + Antara (Bhukthi)
     PRATYANTARA = 3   # + Pratyantara
@@ -1277,5 +1274,215 @@ scorpio_owner_for_dhasa_calculations = None
 aquarius_owner_for_dhasa_calculations = None
 use_kp_dictionary_for_lords_calculation = False
 _JULIAN_TRANSITION_DAY = 2299149.5 # (1582,10,4) (0,0,0)
+# -------------------------------
+# Aṣṭakavarga Daśā: fixed choices
+# -------------------------------
+class ASHTAKAVARGA_DHASA_METHOD:
+    """Available AV-based dasha methods (documented in practitioner literature)."""
+    BAV_PLANET   = "BAV_PLANET"    # Graha dasha; carriers = Sun..Saturn (0..6); weights = planetary BAV totals
+    SAV_SIGN     = "SAV_SIGN"      # Rāśi dasha; carriers = 12 signs (0..11); weights = sign SAV (SAV total=337)
+    PINDA_PLANET = "PINDA_PLANET"  # Graha dasha; carriers = Sun..Saturn; weights = Sodhya-Pinda per planet
+class ASHTAKAVARGA_DHASA_START_RULE:
+    """How to choose which carrier appears first (then rotate base order accordingly)."""
+    MAX_STRENGTH        = "MAX_STRENGTH"         # start from highest-weight item
+    LAGNA_SIGN          = "LAGNA_SIGN"           # (SAV_SIGN only) start from Lagna sign
+    JANMA_RASI          = "JANMA_RASI"           # (SAV_SIGN only) start from Moon sign
+    USER_DEFINED_SIGN   = "USER_DEFINED_SIGN"    # (SAV_SIGN only) start from a sign id (0..11)
+    USER_DEFINED_PLANET = "USER_DEFINED_PLANET"  # (planet methods only) start from a planet id (0..6)
+class ASHTAKAVARGA_DHASA_SEQUENCE_RULE:
+    """How to build the base order before rotating with the start rule."""
+    STRENGTH_ORDER     = "STRENGTH_ORDER"      # sort carriers by weight high→low
+    ZODIACAL_ORDER          = "ZODIACAL_ORDER"           # (SAV_SIGN only) signs 0..11 (Ar..Pi)
+    FIXED_SUN_SATURN  = "FIXED_SUN_SATURN"   # (planet methods only) planets 0..6 (Sun..Saturn)
+# -------------------------------
+# Allowed combinations (policy)
+# -------------------------------
+# Start-rule compatibility
+ASHTAKAVARGA_DHASA_ALLOWED_START_RULES = {
+    ASHTAKAVARGA_DHASA_METHOD.BAV_PLANET:   {ASHTAKAVARGA_DHASA_START_RULE.MAX_STRENGTH,
+                                             ASHTAKAVARGA_DHASA_START_RULE.USER_DEFINED_PLANET},
+    ASHTAKAVARGA_DHASA_METHOD.PINDA_PLANET: {ASHTAKAVARGA_DHASA_START_RULE.MAX_STRENGTH,
+                                             ASHTAKAVARGA_DHASA_START_RULE.USER_DEFINED_PLANET},
+    ASHTAKAVARGA_DHASA_METHOD.SAV_SIGN:     {ASHTAKAVARGA_DHASA_START_RULE.MAX_STRENGTH,
+                                             ASHTAKAVARGA_DHASA_START_RULE.LAGNA_SIGN,
+                             ASHTAKAVARGA_DHASA_START_RULE.JANMA_RASI, ASHTAKAVARGA_DHASA_START_RULE.USER_DEFINED_SIGN},
+}
+# Sequence-rule compatibility
+ASHTAKAVARGA_DHASA_ALLOWED_SEQUENCE_RULES = {
+    ASHTAKAVARGA_DHASA_METHOD.BAV_PLANET:   {ASHTAKAVARGA_DHASA_SEQUENCE_RULE.STRENGTH_ORDER,
+                                             ASHTAKAVARGA_DHASA_SEQUENCE_RULE.FIXED_SUN_SATURN},
+    ASHTAKAVARGA_DHASA_METHOD.PINDA_PLANET: {ASHTAKAVARGA_DHASA_SEQUENCE_RULE.STRENGTH_ORDER,
+                                             ASHTAKAVARGA_DHASA_SEQUENCE_RULE.FIXED_SUN_SATURN},
+    ASHTAKAVARGA_DHASA_METHOD.SAV_SIGN:     {ASHTAKAVARGA_DHASA_SEQUENCE_RULE.STRENGTH_ORDER,
+                                             ASHTAKAVARGA_DHASA_SEQUENCE_RULE.ZODIACAL_ORDER},
+}
+class AAYU_TYPE:
+    PINDA = 0
+    NISARGA = 1
+    AMSA = 2
+    NONE = None
+class KAALA_TYPE:
+    DAWN = 0
+    DAY = 1
+    DUSK = 2
+    NIGHT = 3
+class RASHMI_TYPE:
+    BPHS_HIGHEST_RAY = 1
+    NATURAL_ORDER = 2
+    VIMSOTTARI_ORDER = 3
+class TARA_TYPE:
+    SANJAY_RATH = 1
+    PARASARA = 2
+class CHARA_TYPE:
+    PVN_RAO = 1
+    KN_RAO = 2
+    IRANGATTI_MALE1 = 3
+    IRANGATTI_MALE2 = 4
+    MIND_SUTRA = 5
+class DRIG_TYPE:
+    PVR_PAPER = 1
+    PVR_BOOK = 2
+class KALACHAKRA_TYPE:
+    PVR_BOOK = 1
+    SANJAY_RATH = 2
+    RAGHAVACHARYA = 3
+class MANDOOKA_TYPE:
+    SANJAY_RATH = 1
+    KN_RAO = 2
+class PADHANADHAMSA_TYPE:
+    IRANGATTI_RANGACHARYA = 1
+    SANJAY_RATH = 2
+    PVR_JHORA = 3
+_chart_names = ['raasi_str','hora_str','drekkanam_str','chaturthamsa_str','panchamsa_str',
+              'shashthamsa_str','saptamsam_str','ashtamsa_str','navamsam_str','dhasamsam_str','rudramsa_str',
+              'dhwadamsam_str','shodamsa_str','vimsamsa_str','chaturvimsamsa_str','nakshatramsa_str','thrisamsam_str',
+              'khavedamsa_str','akshavedamsa_str','sashtiamsam_str','nava_navamsa_str','ashtotharamsa_str',
+              'dwadas_dwadasamsa_str','custom_varga_kundali_str','mixed_varga_kundali_str']
+_chart_names_upto_d144 = _chart_names[:-2]
+_bala_names = ['amsa_ruler_str','sphuta_str','drishti_str','bhava_graha_arudha_str','vimsopaka_bala_str','vaiseshikamsa_bala_str',
+               'harsha_pancha_dwadhasa_vargeeya_bala_str','shad_bala_str','bhava_bala_str']
+_graha_dhasa_dict = {'vimsottari':[3,10,3,9,1,0,[],[]],'yoga_vimsottari':[3,10,3,9,1,0,[],[]],'rasi_bhukthi_vimsottari':[3,10,3,12,1,0,[],[]],
+                     'ashtottari':[3,10,3,8,1,0,[],[]],'tithi_ashtottari':[3,10,3,8,1,0,[],[]],'yogini':[4,8,4,8,1,0,[],[]],
+                     'tithi_yogini':[4,8,4,8,1,0,[],[]],'shodasottari':[2,8,4,8,1,0,[],[]],'dwadasottari':[2,8,4,8,1,0,[],[]],
+                     'dwisatpathi':[4,8,4,8,1,0,[],[]],'panchottari':[2,8,4,7,1,0,[],[]],'satabdika':[2,8,4,7,1,0,[],[]],
+                     'chaturaaseeti_sama':[2,8,4,7,1,0,[],[]],'karana_chaturaaseethi_sama':[2,8,4,7,1,0,[],[]],
+                     'shashtisama':[2,8,4,8,1,0,[],[]],'shattrimsa_sama':[6,7,4,8,1,0,[],[]],'naisargika':[2,8,4,6,1,0,[],[]],
+                     'tara':[3,10,3,9,1,0,[],[]],'karaka':[4,7.5,4,8,1,0,[],[]],'buddhi_gathi':[5,7,4,9,1,0,[],[]],
+                     'kaala':[6,8,3,18,1,0,[],[]],'aayu':[2,8,4,8,1,0,[],[]],'saptharishi_nakshathra':[3,8,3,11,1,0,[],[]],
+                     'rashmi':[5,7,4,9,1,0,[],[]],'ashtaka_varga_planet':[5,7,4,9,1,0,[],[]],
+                     'ashtaka_varga_pinda':[5,7,4,9,1,0,[],[]],
+                     }
+dhasa_default_options={'vimsottari':[False,2,1,0,0,0,-1],'yoga_vimsottari':[False,0],
+                             'rasi_bhukthi_vimsottari':[True,False,2,1,0,0,0,-1],'ashtottari':[False,5,1,0,0,0,-1],
+                       'tithi_ashtottari':[0,False,2],'yogini':[False,6,1,0,0,0,-1],'tithi_yogini':[0,False,0],
+                       'shodasottari':[False,7,1,0,0,0,-1],'dwadasottari':[False,26,1,0,0,0,-1],
+                       'dwisatpathi':[False,18,1,0,0,0,-1],'panchottari':[False,16,1,0,0,0,-1],
+                       'satabdika':[False,26,1,0,0,0,-1],'chaturaaseeti_sama':[False,14,1,0,0,0,-1],
+                       'karana_chaturaaseethi_sama':[False,0],'shashtisama':[False,0,1,0,0,0,-1],
+                       'shattrimsa_sama':[False,21,1,0,0,0,-1],'naisargika':[True,False,False],
+                       'tara':[0,0,-1],'karaka':[0,-1],'buddhi_gathi':[0,-1],'kaala':[],'aayu':[3],
+                       'saptharishi_nakshathra':[False,1,0,0,0,-1],'rashmi':[0,-1],'ashtaka_varga_planet':[0,-1],
+                       'ashtaka_varga_pinda':[0,-1],
+                       'narayana':[0,-1],'lagna_kendraadhi':[0,-1],'sudasa':[0,-1],'drig':[0,-1],
+                'niryaana':[0,-1], 'shoola':[0,-1],'karaka_kendraadhi':[0,-1],
+                'chara':[0,-1],'lagnamsaka':[0,-1],'padhanadhamsa':[0,-1],
+                'mandooka':[0,-1],'sthira':[0,-1],'tara_lagna':[0,-1],
+                'brahma':[0,-1],'varnada':[0,-1],'yogardha':[0,-1],
+                'navamsa':[0,-1],'paryaaya':[0,-1],'trikona':[0,-1],
+                'kalachakra':[0,-1],'chakra':[0,-1],
+                'sandhya':[0,-1],'pachaka':[0,-1],
+                'raashiyanka':[0,-1],'ashtaka_varga_sign':[0,-1],
+                'chathurvidha_lagna_utthara':[0,-1],'chathurvidha_kendra_utthara':[0,-1],
+                'chathurvidha_trikona_utthara':[0,-1],'chathurvidha_dasha_utthara':[0,-1],
+                }
+_rasi_dhasa_dict = {'narayana':[4,7,3,12,1,0,[],[]],'lagna_kendraadhi':[4,7,3,12,1,0,[],[]],'sudasa':[4,7,3,12,1,0,[],[]],'drig':[3,8,4,12,1,0,[],[]],
+                'niryaana':[4,7,3,12,1,0,[],[]], 'shoola':[4,7,3,12,1,0,[],[]],'karaka_kendraadhi':[4,7,3,12,1,0,[],[]],
+                'chara':[4,7,3,12,1,0,[],[]],'lagnamsaka':[4,7,3,12,1,0,[],[]],'padhanadhamsa':[4,7,3,12,1,0,[],[]],
+                'mandooka':[4,7,3,12,1,0,[],[]],'sthira':[4,7,3,12,1,0,[],[]],'tara_lagna':[4,7,3,12,1,0,[],[]],
+                'brahma':[4,7,3,12,1,0,[],[]],'varnada':[4,7,3,12,1,0,[],[]],'yogardha':[4,7,3,12,1,0,[],[]],
+                'navamsa':[3,7.5,4,12,1,0,[],[]],'paryaaya':[3,7.5,4,12,1,0,[],[]],'trikona':[3,7.5,4,12,1,0,[],[]],
+                'kalachakra':[3,8,3,9,1,0,[],[]],'chakra':[3,7.5,4,12,1,0,[],[]],
+                'sandhya':[3,7.5,4,12,1,0,[],[]],'pachaka':[3,7.5,4,12,1,0,[],[]],
+                'raashiyanka':[3,7.5,4,12,1,0,[],[]],'ashtaka_varga_sign':[3,7.5,4,12,1,0,[],[]],
+                'chathurvidha_lagna_utthara':[3,7.5,4,12,1,0,[],[]],'chathurvidha_kendra_utthara':[3,7.5,4,12,1,0,[],[]],
+                'chathurvidha_trikona_utthara':[3,7.5,4,12,1,0,[],[]],'chathurvidha_dasha_utthara':[3,7.5,4,12,1,0,[],[]],
+                }
+_annual_dhasa_dict ={'patyayini':[2,7.5,4,8,1,0,[],[]],'varsha_vimsottari':[3,9,3,9,1,0,[],[]],
+                     'varsha_narayana':[5,7.5,4,12,1,0,[],[]],'sudarsana_chakra':[5,7.5,4,12,1,0,[],[]],
+                     'panchasvara':[5,7.5,4,12,1,0,[],[]]}
+#M=Mandi,G=Gulika,B=BhriguBindu,I=Indu Lagna,P=PranaPadaLagna,T=Triphuta,A1-A12=ArudhaLagna,V1-V12=VarnadaLagna
+_everything_considered_for_charts = ['L']+[*range(12)]+["M", "G", "T", "I", "B", "I", "P"]
+sub_planet_dict_1 = {'kaala_str':'kaala_longitude','mrityu_str':'mrityu_longitude','artha_str':'artha_praharaka_longitude',
+                     'yama_ghantaka_str':'yama_ghantaka_longitude',
+                   'gulika_str':'gulika_longitude','maandi_str':'maandi_longitude'}
+sub_planet_list_2 = ['dhuma','vyatipaata','parivesha','indrachaapa','upaketu']
+_multi_cycle_dhasas = {'narayana':2,'lagna_kendraadhi':2,'karaka_kendraadhi':2,'paryaaya':2,'yogini':3,'tithi_yogini':3,
+                       'sudasa':2,'drig':2,'niryaana':2, 'lagnamsaka':2,'dwisatpathi':2,'shashtisama':2,'shattrimsa_sama':3,
+                       'buddhi_gathi':2,'rashmi':8,'panchasvara':2}
+"""
+    Following dhasa cycles depend on their methods:
+    padhanadhamsa: _dhasa_cycle_count = 1 if _dhasa_method==1 else 2
+"""
+planet_dhasas = ['vimsottari','yoga_vimsottari','ashtottari','tithi_ashtottari','yogini','tithi_yogini','shodasottari',
+                 'dwadasottari','dwisatpathi','panchottari','satabdika','chaturaaseeti_sama','karana_chaturaaseethi_sama','shashtisama',
+                 'shattrimsa_sama','tara','buddhi_gathi','kaala','aayu','rashmi','ashtaka_varga_planet',
+                 'ashtaka_varga_pinda','naisargika','patyayini']
+rasi_dhasas = ['narayana','lagna_kendraadhi','sudasa','drig','niryaana','shoola','karaka_kendraadhi','chara','lagnamsaka','padhanadhamsa',
+                'mandooka','sthira','tara_lagna','brahma','varnada','yogardha','navamsa','paryaaya','trikona','kalachakra','chakra','sandhya',
+                'pachaka','raashiyanka','ashtaka_varga_sign','chathurvidha_lagna_utthara','chathurvidha_kendra_utthara','chathurvidha_trikona_utthara',
+                'chathurvidha_dasha_utthara']
+nakshathra_dhasas = ['saptharishi_nakshathra']
+karaka_dhasas = ['karaka']
+special_dhasas = ['panchasvara']
+supported_dhasas = planet_dhasas+rasi_dhasas+nakshathra_dhasas+karaka_dhasas+special_dhasas
+# Minimal registry of aliases/variants → 1 canonical module
+SPECIAL_DASHA_OPTIONS = {
+    "satabdika":{"module":"sataatbika","domain":"graha"},
+    "chaturaaseeti_sama":{"module":"chathuraaseethi_sama","domain":"graha"},
+    "karana_chaturaaseethi_sama":{"module":"karana_chathuraaseethi_sama","domain":"graha"},
+    "panchasvara":{"module":"panchasvara","domain":""},
+    "patyayini":{"module":"patyayini","domain":"annual"},
+    "pachaka": {
+        "module": "sandhya",
+        "domain": "raasi",
+        "defaults": {"use_pachaka_variation": True},
+    },
+    "sandhya": {
+        "module": "sandhya",
+        "domain": "raasi",
+        "defaults": {},
+    },
+    "pinda_aayu": {"module":"aayu", "domain":"graha","defaults":{"aayur_type":AAYU_TYPE.PINDA}},
+    "nisarga_aayu": {"module":"aayu", "domain":"graha","defaults":{"aayur_type":AAYU_TYPE.NISARGA}},
+    "amsa_aayu": {"module":"aayu", "domain":"graha","defaults":{"aayur_type":AAYU_TYPE.AMSA}},
+    # Chathurvidha variants (4 methods) — each is a daśā by itself
+    "chathurvidha_lagna_utthara":   {"module": "chathurvidha_utthara", "domain": "raasi", "defaults": {"dhasa_method": 1}},
+    "chathurvidha_kendra_utthara":  {"module": "chathurvidha_utthara", "domain": "raasi", "defaults": {"dhasa_method": 2}},
+    "chathurvidha_trikona_utthara": {"module": "chathurvidha_utthara", "domain": "raasi", "defaults": {"dhasa_method": 3}},
+    "chathurvidha_dasha_utthara":   {"module": "chathurvidha_utthara", "domain": "raasi", "defaults": {"dhasa_method": 4}},
+    # Ashtaka-varga with explicit “virtual names” for clarity
+    "ashtaka_varga_planet": {"module": "ashtaka_varga", "defaults": {"dhasa_method": ASHTAKAVARGA_DHASA_METHOD.BAV_PLANET}},
+    "ashtaka_varga_sign":   {"module": "ashtaka_varga", "defaults": {"dhasa_method": ASHTAKAVARGA_DHASA_METHOD.SAV_SIGN}},
+    "ashtaka_varga_pinda":  {"module": "ashtaka_varga", "defaults": {"dhasa_method": ASHTAKAVARGA_DHASA_METHOD.PINDA_PLANET}},
+    # The canonical “ashtaka_varga” (no baked-in method; user must pass dhasa_method or your module has a default)
+    "ashtaka_varga": {"module": "ashtaka_varga", "defaults": {}},
+}
 if __name__ == "__main__":
+    print('graha',len(_graha_dhasa_dict),len(dhasa_default_options))
+    print('rasi',len(_rasi_dhasa_dict))
+    print('planet',len(planet_dhasas))
+    print('rasi',len(rasi_dhasas))
+    print([x for x in _graha_dhasa_dict.keys() if x not in planet_dhasas])
     pass

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/experiments/double_transit.py RENAMED Viewed

@@ -702,7 +702,6 @@ if __name__ == "__main__":
     ret1 = double_transit_marriage_windows(jd, place, marriage_age_range=(20,35), step_days=30.0)#, require_both_frames=True)
     print("[SIGN-BASED] hits:", len(ret1))
     print(ret1)
-    exit()
     # Degree-locked DT: both frames, ±60d S/J pairing, ±30d frame tolerance
     ret_deg = double_transit_marriage_windows_degree_locked(
         jd, place,

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/experiments/marriage.py RENAMED Viewed

@@ -508,7 +508,7 @@ def _get_varshaphala_marriage_triggers(jd, place, year, derived):
     # --- Patyayini from Varshaphala LOCAL JD ---
     jd_vf_local = _gregorian_to_jd(vf_y_m_d[0], vf_y_m_d[1], vf_y_m_d[2], vf_hours)
-    patyayini_raw = patyayini.patyayini_dhasa(jd_vf_local, place, divisional_chart_factor=1, chart_method=1)
+    patyayini_raw = patyayini.get_dhasa_bhukthi(jd_vf_local, place, divisional_chart_factor=1, chart_method=1)
     patyayini_schedule = _expand_patyayini_schedule(patyayini_raw)
     tajaka = {
@@ -1252,10 +1252,8 @@ if __name__ == "__main__":
     #dob = (1964,11,16); tob = (4,30,0); place = drik.Place('Karamadai',11.18,76.57,5.5)
     #wedding_date = datetime(1995,6,5)
     #dob = drik.Date(1969,6,22); tob = (21,41,0); place = drik.Place('Trichy',10.49,78.41,5.5)
-    wedding_date = datetime(1999,1,15)
-    dob = (1973,7,26); tob = (21,41,0); place = drik.Place('UNK',16+13/60,80+28/60,5.5)
-    #wedding_date = datetime(1992,2,15)
-    #dob = (1968,5,21); tob = (23,5,0); place = drik.Place('UNK',18+40/60, 78+10/60,5.5)
+    #dob = (1973,7,26); tob = (21,41,0); place = drik.Place('UNK',16+13/60,80+28/60,5.5); wedding_date = datetime(1999,1,15)
+    dob = (1968,5,21); tob = (23,5,0); place = drik.Place('UNK',18+40/60, 78+10/60,5.5); wedding_date = datetime(1992,2,15)
     jd = utils.julian_day_number(dob, tob)
     _astrological_event_checker(jd, place, gender=0)
     exit()

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/experiments/marriage1.py RENAMED Viewed

@@ -710,7 +710,7 @@ def _get_varshaphala_marriage_triggers(jd, place, year, derived):
     muntha_lord = house.house_owner_from_planet_positions(annual_pp, muntha_sign)
     jd_vf_local = _gregorian_to_jd(vf_y_m_d[0], vf_y_m_d[1], vf_y_m_d[2], vf_hours)
-    patyayini_raw = patyayini.patyayini_dhasa(jd_vf_local, place, divisional_chart_factor=1, chart_method=1)
+    patyayini_raw = patyayini.get_dhasa_bhukthi(jd_vf_local, place, divisional_chart_factor=1, chart_method=1)
     patyayini_schedule = _expand_patyayini_schedule(patyayini_raw)
     tajaka = {

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/experiments/marriage2.py RENAMED Viewed

@@ -737,7 +737,7 @@ def _get_varshaphala_marriage_triggers(jd, place, year, derived):
     muntha_lord = house.house_owner_from_planet_positions(annual_pp, muntha_sign)
     jd_vf_local = _gregorian_to_jd(vf_y_m_d[0], vf_y_m_d[1], vf_y_m_d[2], vf_hours)
-    patyayini_raw = patyayini.patyayini_dhasa(jd_vf_local, place, divisional_chart_factor=1, chart_method=1)
+    patyayini_raw = patyayini.get_dhasa_bhukthi(jd_vf_local, place, divisional_chart_factor=1, chart_method=1)
     patyayini_schedule = _expand_patyayini_schedule(patyayini_raw)
     tajaka = {
@@ -1253,8 +1253,8 @@ if __name__ == "__main__":
     utils.set_language('en')
     # dob = (1996,12,7); tob = (10,34,0); place = drik.Place('Chennai',13.0878,80.2785,5.5)
     dob = (1964,11,16); tob = (4,30,0); place = drik.Place('Karamadai',11.18,76.57,5.5)
-    # dob = (1969,6,22); tob = (21,41,0); place = drik.Place('Trichy',10.49,78.41,5.5)
-    dob = (1973,7,26); tob = (21,41,0); place = drik.Place('UNK',16+13/60,80+28/60,5.5)
+    dob = (1969,6,22); tob = (21,41,0); place = drik.Place('Trichy',10.49,78.41,5.5)
+    #dob = (1973,7,26); tob = (21,41,0); place = drik.Place('UNK',16+13/60,80+28/60,5.5)
     jd = utils.julian_day_number(dob, tob)
     # Diagnostics (optional)
     # probe_saturn_landing_near_jup_7L(jd, place, 1991, 10)

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/experiments/marriage3.py RENAMED Viewed

@@ -698,7 +698,7 @@ def _get_varshaphala_marriage_triggers(jd, place, year, derived):
     muntha_lord = house.house_owner_from_planet_positions(annual_pp_d1, muntha_sign)
     # Patyayini anchored at the SAME solar return instant
-    patyayini_raw = patyayini.patyayini_dhasa(jd_years, place, divisional_chart_factor=1, chart_method=1)
+    patyayini_raw = patyayini.get_dhasa_bhukthi(jd_years, place, divisional_chart_factor=1, chart_method=1)
     patyayini_schedule = _expand_patyayini_schedule(patyayini_raw)              # sub-slices
     patyayini_major_schedule = _expand_patyayini_major_schedule(patyayini_raw)  # majors

{pyjhora-4.7.0 → pyjhora-4.8.0}/src/jhora/experiments/marriage4.py RENAMED Viewed

@@ -530,7 +530,7 @@ def _get_varshaphala_marriage_triggers(jd, place, year, derived):
     muntha_sign = (natal_lagna_sign + years_from_dob) % 12
     muntha_lord = house.house_owner_from_planet_positions(annual_pp_d1, muntha_sign)
-    patyayini_raw = patyayini.patyayini_dhasa(jd_years, place, divisional_chart_factor=1, chart_method=1)
+    patyayini_raw = patyayini.get_dhasa_bhukthi(jd_years, place, divisional_chart_factor=1, chart_method=1)
     patyayini_schedule = _expand_patyayini_schedule(patyayini_raw)
     patyayini_major_schedule = _expand_patyayini_major_schedule(patyayini_raw)
@@ -1038,7 +1038,7 @@ if __name__ == "__main__":
                                                     years_from_dob=years_from_dob, divisional_chart_factor=9)
         print('sudarsana chakra dhasa for 1998-1999\n',scdl[0])
         jd_years = drik.next_solar_date(jd, place, years=26)
-        pd = patyayini.patyayini_dhasa(jd_years, place, divisional_chart_factor=1)
+        pd = patyayini.get_dhasa_bhukthi(jd_years, place, divisional_chart_factor=1)
         print('patyayini dhasa',pd)
         td_pp,td = annual_chart(jd, place, divisional_chart_factor=1, years=26)
         td_chart = utils.get_house_planet_list_from_planet_positions(td_pp)

PyJHora 4.7.0__tar.gz → 4.8.0__tar.gz

PyJHora 4.7.0tar.gz → 4.8.0tar.gz