Added support for All-In or Fold

pyfpdb/Card.py

@@ -50,9 +50,11 @@
              'irish'  : ('hold', None,'h', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,4)]), 
           '5_omahahi' : ('hold','omaha','h', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,5)]), 
           '6_omahahi' : ('hold','omaha','h', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,6)]), 
+           '6_omaha8' : ('hold','omaha8','s', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,6)]), 
            '5_omaha8' : ('hold','omaha8','s', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,5)]), 
             'cour_hi' : ('hold','omaha','h', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,5)]), 
           'cour_hilo' : ('hold','omaha8','s', {'PREFLOP':0,'FLOP':1,'TURN':2,'RIVER':3}, 'RIVER', [(0,5)]),
+          'aof_omaha' : ('hold','omaha','h', {'FLOP':0,'TURN':1,'RIVER':2}, 'RIVER', [(0,4)]),
            '5_studhi' : ('stud','holdem', 'h', {'SECOND': 0, 'THIRD': 1,'FOURTH': 2,'FIFTH': 3}, 'FIFTH', [(0,2),(0,3),(0,4),(0,5)]), 
                'razz' : ('stud', None, 'l', {'THIRD': 0,'FOURTH': 1,'FIFTH': 2,'SIXTH': 3,'SEVENTH': 4}, 'SEVENTH', [(0,3),(0,4),(0,5),(0,6),(0,7)]), 
              'studhi' : ('stud','7stud', 'h', {'THIRD': 0,'FOURTH': 1,'FIFTH': 2,'SIXTH': 3,'SEVENTH': 4}, 'SEVENTH', [(0,3),(0,4),(0,5),(0,6),(0,7)]), 

pyfpdb/Database.py

@@ -878,11 +878,13 @@ def connect(self, backend=None, host=None, database=None,
             self.cursor = self.connection.cursor()
             self.cursor.execute(self.sql.query['set tx level'])
             self.check_version(database=database, create=create)
+            self.commit()
 
     def get_sites(self):
         self.cursor.execute("SELECT name,id FROM Sites")
         sites = self.cursor.fetchall()
         self.config.set_site_ids(sites)
+        self.commit()
 
     def check_version(self, database, create):
         self.wrongDbVersion = False

pyfpdb/DerivedStats.py

@@ -425,13 +425,17 @@ def assembleHandsStove(self, hand):
                             maxcards = (base!='hold' and len(cards)>=5)
                             if notnull and (postflop or maxcards):
                                 for hl, side in hiLoKey[hilo]:
-                                    value, rank = pokereval.best(side, cards, bcards)
-                                    rankId = Card.hands[rank[0]][0]
-                                    if rank!=None and rank[0] != 'Nothing':
-                                        _cards = ''.join([pokereval.card2string(i)[0] for i in rank[1:]])
-                                    else:
-                                        _cards = None
-                                    self.handsstove.append( [hand.dbid_hands, hand.dbid_pids[pname], streetId, boardId, hl, rankId, value, _cards, 0] )
+                                    try:
+                                        value, rank = pokereval.best(side, cards, bcards)
+                                        rankId = Card.hands[rank[0]][0]
+                                        if rank!=None and rank[0] != 'Nothing':
+                                            _cards = ''.join([pokereval.card2string(i)[0] for i in rank[1:]])
+                                        else:
+                                            _cards = None
+                                        self.handsstove.append( [hand.dbid_hands, hand.dbid_pids[pname], streetId, boardId, hl, rankId, value, _cards, 0] )
+                                    except RuntimeError:
+                                        log.error("assembleHandsStove: error determining value and rank for hand %s %s" % (hand.handid, hand.in_path))
+                                        self.handsstove.append( [hand.dbid_hands, hand.dbid_pids[pname], streetId, boardId, 'n', 1, 0, None, 0] )
                             else:
                                 self.handsstove.append( [hand.dbid_hands, hand.dbid_pids[pname], streetId, boardId, 'n', 1, 0, None, 0] )
             else:
@@ -467,14 +471,18 @@ def getAllInEV(self, hand, evalgame, holeplayers, boards, streets, holecards):
                     if len(players) == len(valid) and (board['allin'] or hand.publicDB):
                         if board['allin'] and not startstreet: startstreet = street
                         if len(valid) > 1:
-                            evs = pokereval.poker_eval(
-                                game = evalgame, 
-                                iterations = Card.iter[streetId],
-                                pockets = [holecards[p]['hole'] for p in valid],
-                                dead = deadcards, 
-                                board = [str(b) for b in board['board'][n]] + (5 - len(board['board'][n])) * ['__']
-                            )
-                            equities = [e['ev'] for e in evs['eval']]
+                            try:
+                                evs = pokereval.poker_eval(
+                                    game = evalgame, 
+                                    iterations = Card.iter[streetId],
+                                    pockets = [holecards[p]['hole'] for p in valid],
+                                    dead = deadcards, 
+                                    board = [str(b) for b in board['board'][n]] + (5 - len(board['board'][n])) * ['__']
+                                )
+                                equities = [e['ev'] for e in evs['eval']]
+                            except RuntimeError:
+                                log.error("getAllInEV: error running poker_eval for hand %s %s" % (hand.handid, hand.in_path))
+                                equities = [1000]
                         else:
                             equities = [1000]
                         remainder = (1000 - sum(equities)) / Decimal(len(equities))
@@ -483,7 +491,7 @@ def getAllInEV(self, hand, evalgame, holeplayers, boards, streets, holecards):
                             p = valid[i]
                             pid = hand.dbid_pids[p]
                             if street == startstreet:
-                                rake = Decimal(0) if hand.cashedOut else (hand.rake * (Decimal(pot)/Decimal(hand.totalpot)))
+                                rake = hand.rake * (Decimal(pot)/Decimal(hand.totalpot))
                                 holecards[p]['eq'] += ((pot - rake) * equities[i])/Decimal(10)
                                 holecards[p]['committed'] = 100*hand.pot.committed[p] + 100*hand.pot.common[p]
                             for j in self.handsstove:
@@ -534,7 +542,7 @@ def getBoardsDict(self, hand, base, streets):
                         runitcards += hand.board[street_i]
                         sId = len(boardcards + runitcards) - 3
                         boardStreets[sId].append(boardcards + runitcards)
-            for i in range(len(boardStreets)):
+            for i in range(len([b for b in boardStreets if len(b)>0])):
                 if boardStreets[i]:
                     boards[allInStreets[i+1]]['board'] = boardStreets[i]
         else:   
@@ -652,6 +660,10 @@ def assembleHandsPots(self, hand):
             ):
             #print 'DEBUG hand.collected', hand.collected
             #print 'DEBUG hand.collectees', hand.collectees
+            if not hand.cashedOut:
+                for p in hand.players:
+                    self.handsplayers[p[1]]['rake'] = 0
+                hand.rake = 0
             rakes, totrake, potId = {}, 0, 0
             for pot, players in hand.pot.pots:
                 if potId ==0: pot += (sum(hand.pot.common.values()) + hand.pot.stp)
@@ -704,7 +716,6 @@ def assembleHandsPots(self, hand):
                                     potFound[pname][0] += ppot
                                     data = {'potId': potId, 'boardId': boardId, 'hiLo': hl,'ppot':ppot, 'winners': [m for m in pnames if pname!=n], 'mod': ppot>potSplit}
                                     playersPots[pname][1].append(data)
-                                    self.handsplayers[pname]['rake'] = 0
 
             for p, (total, info) in playersPots.iteritems():
                 #log.error((p, (total, info)))
@@ -733,7 +744,9 @@ def assembleHandsPots(self, hand):
                         potFound[p][1] -= collected
                         insert = [None, item['potId'], item['boardId'], item['hiLo'][0], hand.dbid_pids[p], int(item['ppot']*100), int(collected*100), int(rake*100)]   
                         self.handspots.append(insert)
-                        self.handsplayers[p]['rake'] += int(rake*100)
+                        if not hand.cashedOut:
+                            self.handsplayers[p]['rake'] += int(rake*100)
+                            hand.rake += rake
 
     def setPositions(self, hand):
         """Sets the position for each player in HandsPlayers
@@ -1289,7 +1302,7 @@ def foldTofirstsBetOrRaiser(self, actions, street, aggressor):
                     players[act[0]] = False
                 if act[1] == 'raises' or act[1] == 'completes': 
                     break
-            elif act[1]!='discards':
+            elif act[1] not in ('discards','stands pat'):
                 i+=1
         return players
 

pyfpdb/GGPokerToFpdb.py

@@ -209,7 +209,7 @@ class GGPoker(HandHistoryConverter):
                         and\stheir\sown\sbounty\sincreases\sby\s%(CUR)s(?P<INCREASE>[\.0-9]+)\sto\s%(CUR)s(?P<ENDAMT>[\.0-9]+)$"""
                          %  substitutions, re.MULTILINE|re.VERBOSE)
     re_Rake             = re.compile(u"""
-                        Total\spot\s%(CUR)s(?P<POT>[,\.0-9]+)(.+?)?\s\|\sRake\s%(CUR)s(?P<RAKE>[,\.0-9]+)"""
+                        Total\spot\s%(CUR)s(?P<POT>[,\.0-9]+)(.+?)?\s\|\sRake\s%(CUR)s(?P<RAKE>[,\.0-9]+)(\s\|\sJackpot\s%(CUR)s(?P<JACKPOT>[,\.0-9]+))?(\s\|\ssBingo\s%(CUR)s(?P<BINGO>[,\.0-9]+))?"""
                          %  substitutions, re.MULTILINE|re.VERBOSE)
 
     re_STP             = re.compile(u"""
@@ -683,6 +683,14 @@ def readCollectPot(self,hand):
                 for m in self.re_CollectPot4.finditer(pre):
                     pot = '-' + self.clearMoneyString(m.group('POT'))
                     hand.addCollectPot(player=m.group('PNAME'),pot=pot)
+        if hand.cashedOut:
+            m = self.re_Rake.search(post)
+            if m:
+                hand.rake = Decimal(m.group('RAKE'))
+                if m.group('JACKPOT'):
+                    hand.rake += Decimal(m.group('JACKPOT'))
+                if m.group('BINGO'):
+                    hand.rake += Decimal(m.group('BINGO'))
 
     def readShownCards(self,hand):                
         for m in self.re_ShownCards.finditer(hand.handText):

pyfpdb/Hand.py

@@ -707,7 +707,9 @@ def addBlind(self, player, blindtype, amount):
 
             street = 'BLAH'
 
-            if self.gametype['base'] == 'hold':
+            if self.gametype['category'] == 'aof_omaha':
+                street = 'FLOP'
+            elif self.gametype['base'] == 'hold':
                 street = 'PREFLOP'
             elif self.gametype['base'] == 'draw':
                 street = 'DEAL'
@@ -1098,6 +1100,11 @@ def __init__(self, config, hhc, sitename, gametype, handText, builtFrom = "HHC",
             self.discardStreets = ['PREFLOP']
         self.communityStreets = ['FLOP', 'TURN', 'RIVER']
         self.actionStreets = ['BLINDSANTES','PREFLOP','FLOP','TURN','RIVER']
+        if gametype['category']=='aof_omaha':
+            self.allStreets = ['BLINDSANTES','FLOP','TURN','RIVER']
+            self.holeStreets = ['FLOP']
+            self.communityStreets = ['FLOP', 'TURN', 'RIVER']
+            self.actionStreets = ['BLINDSANTES','FLOP','TURN','RIVER']
         Hand.__init__(self, self.config, sitename, gametype, handText, builtFrom = "HHC")
         self.sb = gametype['sb']
         self.bb = gametype['bb']
@@ -1157,7 +1164,9 @@ def addShownCards(self, cards, player, shown=True, mucked=False, dealt=False, st
             if shown:  self.shown.add(player)
             if mucked: self.mucked.add(player)
         else:
-            if len(cards) in (2, 3, 4, 6) or self.gametype['category'] in ('5_omahahi', '5_omaha8', 'cour_hi', 'cour_hilo'):  # avoid adding board by mistake (Everleaf problem)
+            if self.gametype['category'] == 'aof_omaha':
+                self.addHoleCards('FLOP', player, open=[], closed=cards, shown=shown, mucked=mucked, dealt=dealt)
+            elif len(cards) in (2, 3, 4, 6) or self.gametype['category'] in ('5_omahahi', '5_omaha8', 'cour_hi', 'cour_hilo'):  # avoid adding board by mistake (Everleaf problem)
                 self.addHoleCards('PREFLOP', player, open=[], closed=cards, shown=shown, mucked=mucked, dealt=dealt)
             elif len(cards) == 5:     # cards holds a winning hand, not hole cards
                 # filter( lambda x: x not in b, a )             # calcs a - b where a and b are lists

pyfpdb/HandHistoryConverter.py

@@ -417,7 +417,8 @@ def readOther(self, hand): pass
     # Some sites don't report the rake. This will be called at the end of the hand after the pot total has been calculated
     # an inheriting class can calculate it for the specific site if need be.
     def getRake(self, hand):
-        hand.rake = hand.totalpot - hand.totalcollected #  * Decimal('0.05') # probably not quite right
+        if hand.rake is None:
+            hand.rake = hand.totalpot - hand.totalcollected #  * Decimal('0.05') # probably not quite right
         if self.siteId == 9 and hand.gametype['type'] == "tour":
             round = -5 #round up to 10
         elif hand.gametype['type'] == "tour":

pyfpdb/KingsClubToFpdb.py

@@ -201,6 +201,7 @@ class KingsClub(HandHistoryConverter):
 
     re_Rake = re.compile(r"^Rake\s(?P<RAKE>[,.0-9]+)$", re.MULTILINE)
     re_Split = re.compile(r"\*\*\* BOARD 1 - FLOP \*\*\*")
+    re_Table = re.compile(r"^\s?Table\s(ID\s)?\'(?P<TABLE>.+?)\'\s", re.MULTILINE|re.VERBOSE)
 
     def compilePlayerRegexs(self,  hand):
         players = set([player[1] for player in hand.players])
@@ -266,9 +267,13 @@ def determineGameType(self, handText):
 
         m2 = self.re_Split.search(handText)
         if m2:
-            info['split'] = True
+            info['split'] = True 
         else:
             info['split'] = False
+
+        m3 = self.re_Table.search(handText)
+        if m3 and 'AOF' in m3.group('TABLE'):
+            info['category'] = 'aof_omaha'
 
         if info['limitType'] == 'fl' and info['bb'] is not None:
             if info['type'] == 'ring':
@@ -432,11 +437,14 @@ def markStreets(self, hand):
                 r"(\*\*\* BOARD 1 - RIVER \*\*\* \[(?P<FLOP1>\S\S \S\S \S\S) (?P<TURN1>\S\S)] (?P<RIVER1>\[\S\S\].+(?=\*\*\* BOARD 2 - RIVER \*\*\*)|.+))"
                 r"(\*\*\* BOARD 2 - RIVER \*\*\* \[(?P<FLOP2>(\S\S|\-) (\S\S|\-) (\S\S|\-)) (?P<TURN2>(\S\S|\-))] (?P<RIVER2>\[\S\S\].+))", post,re.DOTALL)
             if m1:
-                if hand.streets.get('FLOP') is None:
+                if hand.streets.get('FLOP') is None or re.search(r"\*\*\* BOARD 1 - FLOP \*\*\*", post,re.DOTALL):
                     hand.streets.update({'FLOP1': m1.group('FLOP1'),'FLOP2': m1.group('FLOP2')})
-                if hand.streets.get('TURN') is None:
+                    hand.streets['FLOP'] = []
+                if hand.streets.get('TURN') is None or re.search(r"\*\*\* BOARD 1 - TURN \*\*\*", post,re.DOTALL):
                     hand.streets.update({'TURN1': m1.group('TURN1'),'TURN2': m1.group('TURN2')})
+                    hand.streets['TURN'] = []
                 hand.streets.update({'RIVER1': m1.group('RIVER1'),'RIVER2': m1.group('RIVER2')})
+                hand.streets['RIVER'] = []
             else:
                 m2 =  re.search(
                     r"(\*\*\* RIVER \*\*\* \[(?P<FLOP>\S\S \S\S \S\S) (?P<TURN>\S\S)] (?P<RIVER>\[\S\S\].+(?=\*\*\* SUMMARY \*\s?\*\*)|.+))", post,re.DOTALL)
@@ -534,7 +542,8 @@ def readHoleCards(self, hand):
                     newcards = [x for x in found.group('NEWCARDS').split(' ') if x != 'X']
                     if len(newcards)>0: 
                         hand.hero = found.group('PNAME')  
-                        hand.addHoleCards(street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True)
+                        _street = 'FLOP' if hand.gametype['category'] == 'aof_omaha' else street
+                        hand.addHoleCards(_street, hand.hero, closed=newcards, shown=False, mucked=False, dealt=True)
 
         for street, text in hand.streets.iteritems():
             if not text or street in ('PREFLOP', 'DEAL'): continue  # already done these
@@ -628,8 +637,7 @@ def readShowdownActions(self, hand):
         pass
 
     def readCollectPot(self,hand):
-        if ((hand.gametype['category'] == '27_1draw' and hand.gametype['limitType'] == 'nl') or
-            hand.gametype['base'] == 'stud'):
+        if ((hand.gametype['category'] == '27_1draw' and hand.gametype['limitType'] == 'nl')):
             hand.adjustCollected = False
         else:
             hand.adjustCollected = True

pyfpdb/PacificPokerSummary.py

@@ -44,7 +44,7 @@ class PacificPokerSummary(TourneySummary):
                            'NUM' : u".,\d\xa0"                     # legal characters in number format
                     }
 
-    re_Identify = re.compile(u'\*{5}\s(Cassava|888poker|888)(\.[a-z]{2})?(\-[a-z]{2})? Tournament Summary\s\*{5}')
+    re_Identify = re.compile(u'\*{5}\s(Cassava|888poker|888)?(\.[a-z]{2})?(\-[a-z]{2})? ?Tournament Summary\s\*{5}')
 
     re_TourneyInfo = re.compile(u"""
                         Tournament\sID:\s(?P<TOURNO>[0-9]+)\s+

pyfpdb/PacificPokerToFpdb.py

@@ -241,6 +241,8 @@ def readHandInfo(self, hand):
                     datetimestr = "%s/%s/%s %s:%s:%s" % (a.group('Y'), a.group('M'),a.group('D'),a.group('H'),a.group('MIN'),a.group('S'))
                 hand.startTime = datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S")
                 hand.startTime = HandHistoryConverter.changeTimezone(hand.startTime, "ET", "UTC")
+                hand.newFormat = datetime.datetime.strptime('20220908000000','%Y%m%d%H%M%S') #this is a guess
+                hand.newFormat = HandHistoryConverter.changeTimezone(hand.newFormat, "ET", "UTC")
             if key == 'HID':
                 hand.handid = info[key]
             if key == 'TOURNO' and info['TOURNO'] != None:
@@ -350,7 +352,8 @@ def readBringIn(self, hand):
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
 
     def readBlinds(self, hand):
-        hand.setUncalledBets(True)
+        if hand.startTime < hand.newFormat:
+            hand.setUncalledBets(True)
         liveBlind, hand.allInBlind = True, False
         for a in self.re_PostSB.finditer(hand.handText):
             if a.group('PNAME') in hand.stacks:

pyfpdb/PartyPokerToFpdb.py

@@ -239,7 +239,7 @@ def compilePlayerRegexs(self,  hand):
                 r"%(PLYR)s posts button blind  ?[%(BRAX)s]?%(CUR_SYM)s?(?P<BUB>[.,0-9]+)\s*%(CUR)s?[%(BRAX)s]?\.?\s*$" %  subst,
                 re.MULTILINE)
             self.re_Antes = re.compile(
-                r"%(PLYR)s posts ante( of)? [%(BRAX)s]?%(CUR_SYM)s(?P<ANTE>[.,0-9]+)\s*%(CUR)s[%(BRAX)s]?\.?\s*$" %  subst,
+                r"%(PLYR)s posts ante( of)? [%(BRAX)s]?%(CUR_SYM)s?(?P<ANTE>[.,0-9]+)\s*(%(CUR)s)?[%(BRAX)s]?\.?\s*$" %  subst,
                 re.MULTILINE)
             self.re_HeroCards = re.compile(
                 r"Dealt to %(PLYR)s \[\s*(?P<NEWCARDS>.+)\s*\]" % subst,